Upgraded project to use Vagrant 1.2. Bare minimum changes to use new version.
Merge pull request #160 from geerzo/vagrant_1.2_upgrade

Upgrade project to use Vagrant 1.2