Gemfile.lock changes and possibly broken db stuff
Merge branch 'master' of https://github.com/unhaltable/exemplary