Merge pull request #597 from SalesforceFoundation/feature/sprint13-misc-fixes

Feature/sprint13 misc fixes
Merge branch 'dev' of https://github.com/SalesforceFoundation/Cumulus into feature/sprint13-misc-fixes