Use Django 1.5 syntax for {% url %} tag
Merge branch 'mapumental_api_update' of ssh://git.mysociety.org/data/git/public/commonlib into mapumental_api_update