Cleanup
Merge pull request #33 from civicrm/cleanup-20130709

Formatting Cleanup