Added Colloquy
Added Dropbox to manifest/site.pp and Puppetfile
Merge branch 'master' of https://github.com/mightyhops/Boxenhops

Conflicts:
	Puppetfile
	manifests/site.pp