upgrade django to 1.6 (and upgrade the packages that immediately break)
enable persistent connections
Merge branch 'master' into django1.6
fix ProductionExternalLinkForm to explicitly set is_download_link=False; as of Django 1.6, the default is null rather than false
eliminate use of label_tag, because in django 1.6 it rudely adds a colon that I don't want
update password reset URLs for Django 1.6