Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.

Conflicts:
	fabfile.py
Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.
Working on Heroku integration.
Index name for Haystack.
Index name for Haystack.
Index name for Haystack.
Index name for Haystack.
Index name for Haystack.
Cookie domain for Heroku.
Testing search.
Working on ES integration for Heroku.
Working on ES integration for Heroku.
S3 static URLs.