Updated code for django 1.7+.
Bumped version numbers for 2.1.0.