Improve vagrant setup guide
Minor clarification
Merge branch 'develop'