update for compatibility with Django 1.5 and updates from newfs/gobotany-app