Fix merge conflict
Fix merge conflict
Merge branch 'master' of github.com:juliandunn/bento
Fix merge conflict
Merge branch 'master' of github.com:juliandunn/bento
Fix Gemfile and Gemfile.lock
Merge pull request #55 from juliandunn/fix-gemfile

Fix Gemfile and Gemfile.lock. Also, fix some missing directives from the Debian base definition.