Convert to vagrant 1.2, fix some script quirks
Merge pull request #6 from weltenwort/master

Update Vagrantfile to vagrant 1.2, fix some script quirks