Upgraded to Vagrant 1.1, incompatible configuration file though with
previous versions
Merge branch 'master' into composite
Updates for Vagrant 1.1