update Vagrantfile for vagrant 1.2.x
Vagrantfile: update for vagrant 1.2.x
Merge branch 'develop'