Port to Django 1.6

Use django-rstify in replacement of deprecated django.contrib.markup
Improved readability