Vagrant file back to normal
Merge branch 'master' of https://github.com/raphirm/marqurap