Merge pull request #154 from TheWeatherCompany/develop

white space and formatting fixes
Update for TheWeatherCompany/grid-api#631
Merge pull request #56 from greese/develop

Merge pull request #154 from TheWeatherCompany/develop
Merge branch 'develop' into issue-670
Renamed certificateName -> certificateId, certificateResourceId/arn -> providerCertificateId, certificateId - removed (#670)