Merge pull request #48 from innocenceproject/sync-fixes

The last non-broken out changeset, includes...
Merge github.com:innocenceproject/collective.salesforce.fundraising into sync-fixes