Merge pull request #1 from adsabs/vss

Many bugfixes, now passes the `vagrant destroy && vagrant up` test:
Merge pull request #2 from adsabs/vss

Removal of submodules; now full provision with puppet
timeout=>0 for stage2; more unique name for vm.box so other vagrant boxes aren't accidentely imported