Merge pull request #3177 from colemanw/cleanup
authorcolemanw <coleman@civicrm.org>
Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)
committercolemanw <coleman@civicrm.org>
Mon, 5 May 2014 18:36:49 +0000 (14:36 -0400)
Various fixes and cleanup


Trivial merge