whoops, forgot Gemfile.lock
Merge branch 'master' into release