Upgraded to Django 1.6, updated markdown to custom version