Github hooks. That's right.

Point your hook to hit /hooks/main?secret=[sails.config.hook_secret]
Remove logging and add a few spaces
Merge branch 'hooks-for-github' into for-prod
Colors and support for no_deploy
Fixes for production
Merge branch 'production-fixes' into for-prod

Conflicts:
	api/controllers/HooksController.js
	public/mast.js
Merge branch 'hooks-for-github' into for-prod
css for buildstatus
Hmmm, this is wrong
Merge remote branch 'origin/ci-branch' into for-prod
Fixes to circle.
Merge branch 'master' into for-prod

Conflicts:
	api/controllers/HooksController.js
	config/application.js
Merge remote branch 'origin/ci-branch' into for-prod
Add in stitched views for each pull
Merge remote branch 'origin/stitched-list' into for-prod
From orange to opacity .5
Handle state changes
Merge remote branch 'origin/stitched-list' into for-prod
Yay pretty
A FAQ modal

This is a very basic FAQ modal, because people keep asking what the
seals are that they can use. It can be accessed from the "FAQ"
link added to the "Filters" dropdown, so it's out of the way.

Perhaps not the most obvious place for it. But it works.

Conflicts:

	views/home/index.ejs