updates to package.json, addition of Vagrant
merging