Updates for Python 3 compatibility
Templates updates for Django 1.4 compatibility
Tests updated to pass with Django 1.4.2