Fixed several Django 1.4 and 1.5 deprecations
Merge branch 'master' into user-model