Merge branch 'master' of git://github.com/boxen/our-boxen

Conflicts:
	Puppetfile.lock
add watch
Merge branch 'master' of git://github.com/boxen/our-boxen
Merge branch 'master' of github.com:akiyan/our-boxen