Add changes to make the app compatible with Python3.2/Django1.5

It eventually uses a different copy of django-markup to deal
with a compatibility issue.