Upgrade Vagrant to 1.4.0

http://www.vagrantup.com/downloads.html
http://www.vagrantup.com/blog/vagrant-1-4.html
Merge pull request #2027 from fsargent/patch-2

Upgrade Vagrant to 1.4.0