Remco django16

Updates for Django 1.6 compatibility