vagrant files
Merge branch 'master'