Fixed merge error and updated Procfile
Updated Procfile with new location of smokesignalsd
Fixed a bug in smokesignalsd
Fixed typo in process_feeds
Removed debug log statements
Turned off debug mode and fixed duplicate app running on Heroku
Fixing duplicate debug configurations and deletion constraint issues
Merge branch 'master' into heroku

Conflicts:
	smokesignals/views.py