upgrade settings so Vagrant 1.2.7 works
Merge pull request #1 from Trott/vagrant-upgrade

upgrade settings so Vagrant 1.2.7 works
Merge pull request #184 from Trott/master

incorporate vagrant updates into master repo