make compatible with django 1.6
ensure backwards compatibility
update changelog
version bump
Merge branch 'release/1.0.0'