Vagrant 1.5.4
Merge pull request #94 from sakai135/patch-2

Vagrant 1.5.4