Updating nodejs and ruby modules
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock
Updated vagrant module to 2.0.10
Updated evernote module to 2.0.4