Update mongoid config per MongoHQ docs
Merge branch 'develop'