correct vagrant setup
updated readme
Merge branch 'vagrant' into develop