Merge branch 'feature/8_django_upgrade' into dev
Merge branch 'feature/8_django_upgrade' into dev
Updated encode() to accept Unicode. (#8)
Initial cleanup for 1.6. (#8)