Update mongoid.yml to look just like it does in heroku docs
Merge branch 'develop'