More fixes to make it work on Ubuntu 14.04

* Updated Gemfile because of berkshelf bug.