Fixes to vagrant configuration. Fixes to merge from google hackathon.