Use our own markdown tag, then we can move onto 1.6+
Make things Django 1.6 compatibile
Merge branch 'django16'