Merge pull request #149 from thorduri/master

Make it possible to run it out the box as the berkshelf user.