Remove reference to defaults module, which was removed in Django 1.6
Merge remote-tracking branch 'jackcarter/master' into travis-tests
Capability of running on django1.6, even though tests fail.