Merge pull request #112 from pmorie/vagrant

Only bring up atomic vm if USE_ATOMIC env var is set
Fix tabs in Vagrantfile