Additional modules in Puppetfile
starting people::hakamadare class
argh
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
	modules/people/manifests/hakamadare.pp
blarg
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	Puppetfile.lock
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
	modules/people/manifests/hakamadare.pp
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	Puppetfile
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	modules/people/manifests/hakamadare.pp
Merge branch 'master' of https://github.com/hakamadare/our-boxen

Conflicts:
	Puppetfile
	Puppetfile.lock
	modules/people/manifests/hakamadare.pp
	modules/projects/manifests/rk_web.pp