Code Review

Do not merge this. 

This branch is for comments, only.
You should keep configuration examples so that if anyone else wants to work on your application, they can easily set up a working instance.