Upgraded vagrant file to support 1.1+ Vagrant syntax. http://docs.vagrantup.com/v2/vagrantfile/version.html
Merge pull request #615 from htmldrum/upgrade_vagrant_syntax_to_version_2

Upgraded vagrant file to support 1.1+ Vagrant syntax