Initial vagrant setup
Merge origin/master