Initial heroku commits
Disable websockets on heroku
Merge branch 'master' of heroku.com:pulldash into for-prod-heroku
base secret
Merge branch 'for-prod' into for-prod-heroku
Merge branch 'for-prod' of github.com:freshvolk/north-american-octo-wight into for-prod
Merge branch 'for-prod' of github.com:freshvolk/north-american-octo-wight into for-prod
Merge branch 'for-prod' of github.com:freshvolk/north-american-octo-wight into for-prod
Merge branch 'for-prod' of github.com:freshvolk/north-american-octo-wight into for-prod

Conflicts:
	config/local.js
Merge branch 'for-prod' of github.com:freshvolk/north-american-octo-wight into for-prod