Small fixes for Django 1.7, also cosmetic changes and typo fixes