bump mongoid to final 4.0 version
Committing the lockfile to match the gemspec
Merge branch 'bump_mongoid'

Rebasing and merging pull request #172
Also added the lockfile