Fixes for pretect
Merge branch 'master' of github.com:PythonUnited/djinn_core
Move to django 1.6.x