remove Vagrantfile
Merge branch 'develop'