- updated Vagrantfile
Merge remote-tracking branch 'origin/master'

Conflicts:
	nodejs-mongodb-redis/Vagrantfile