Refactored and added unicorn support.
Merge branch 'unicorn'

Conflicts:
	files/etc/god/puppetmaster.god
	manifests/server/unicorn.pp
	templates/puppetmaster.nginx.conf.erb