Merge remote-tracking branch 'vg/master' into updater

Conflicts:
	vagrant/Cheffile
	vagrant/Cheffile.lock
	vagrant/README.md
	vagrant/Vagrantfile
	vagrant/project_cookbooks/box_setup/attributes/default.rb
	vagrant/project_cookbooks/box_setup/recipes/npm.rb
	vagrant/project_cookbooks/box_setup/templates/default/apache_vhost.conf.erb