Django 1.6 changes

Changes to import statements are backwards compatible. Changes to url template tag is not, though - see mass_upload.html for details.