Minor models cleanup
Updated url template tags for Django 1.5