timeout=>0 for stage2; more unique name for vm.box so other vagrant boxes aren't accidentely imported
Merge branches 'vss' and 'master'