try runserver for heroku
upgrade gunicorn
Merge pull request #580 from jtakayama/django-1.6-migration

Vagrant ALLOWED_HOSTS fixes for Django 1.6 upgrade.
fix sphinx for django 1.6 autodoc
Merge branch 'master' of http://github.com/csdl/makahiki into django-1.6-migration