mongo stuff so no more broke
Merge branch 'master' of github.com:revelrylabs/our-boxen

Conflicts:
	Puppetfile.lock