Upgrade to Vagrant 1.5 syntax for global_config
Fix using the berkshelf config