Merge pull request #11 from SaqibS/master

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