Merge pull request #69 from sorenh/vagrantfile

A bunch of Vagrantfile improvements
Make environment confiugurable in vagrant

allow users to set env as an env var to change
what cloud file and env are used for deployment.
Merge pull request #72 from bodepd/vagrantfile_fixes

Vagrantfile fixes
Merge branch 'master' into consul