putting heroku requirements in requirements-heroku.txt
Merge branch 'master' of github.com:ysim/django-1.6-template