fixing vagrant and .gitignore issues
Merged Colin's latest