Add .gitignore
Fix hipchat setup
Logging
Merge branch 'master' into deploy

Conflicts:
	app/start/global.php