Vagrant 1.2.4
Merge pull request #767 from timsutton/vagrant-1.2.4

Vagrant 1.2.4