Changes for Vagrant1.6+ and new vagrant-berkshelf version

Minor fixes to make 'vagrant up' work again with newer versions of Vagrant and vagrant-berkshelf

Thanks!