Enable berkshelf in Vagrantfile to fix berkshelf-vagrant/issues/11
Merge branch 'master' of github.com:webcoyote/linux-vm