Updated from remote branch.
Upgrading Django to 1.5
Updated templates to Django 1.5 url syntax and adjusted s/media_url/static_url.
Django 1.5 cleanup with pep8 and linting.