Update to puppet-nodejs 3.7.0
Merge pull request #559 from skottler/nodejs_370

Update to puppet-nodejs 3.7.0
Add deep_merge to the Gemfile(.lock) and vendor it
Merge pull request #561 from skottler/bugs/560

Add deep_merge to the Gemfile(.lock) and vendor it
Upgrade boxen version to 2.5.0

Closes #554
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
Install mongodb
Install virtualbox 4.3.10
Updated bower to 1.3.2
updated boxen-git to 2.3.0
Merge pull request #569 from tarebyte/master

Update Puppetfile boxen-git to 2.3.0
Merge branch 'master' of https://github.com/boxen/our-boxen
bump version on modules (includes ruby heartbleed fix)
Merge pull request #572 from mroth/heartbleed

bump version on modules (includes ruby heartbleed fix)
Merge branch 'master' of https://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock
Updated go==1.2.1, mercurial==2.9.2, setuptools==3.4.3, wheel=0.23.0
Updated iterm to 1.0.8
Install packer
Updated mongodb==1.3.0 firefox==1.1.8