back to original vagrantfile
Revert "updated comments on hhvm"

This reverts commit 577eb0b5c91bc074cd2d3a349c8160ad7392916c.
fixing Vagrantfile from some breaking changes
removing some additions
updated merge conflict from develop