Upgrade to Vagrant 1.2.1
Merge pull request #238 from ryanneufeld/patch-2

Upgrade to Vagrant 1.2.1