Revert "Change provider to contrib [Fixes #30]"

This reverts commit 12da0af7788f77946fa2dea9227ba2add8bcc60f.

It unbreaks issues with using a different provider name
Merge remote-tracking branch 'cf/master'
clarify some of the values used in the deployment
Merge pull request #59 from fearoffish/master

Clarify some naming, and also do the OCD thing and clean up whitespace