Fixes for Django 1.4+
Merge pull request #1 from jefftriplett/master

Url fix for Django 1.6 (1.4+)