Basic work to make it Django 1.6 compatible.
Bumped version number.
Merge branch 'release/0.3.8' into develop