support heroku
support heroku
Merge branch 'master' of heroku.com:toucan-sam

Conflicts:
	Procfile
heroku compatable static files
add dj-static to requirements
try out dj-static settings
use gunicorn, not test server
ok, fine, I guess we need to install gunicorn to use gunicorn
hack to get gunicorn to run in toucansam directory