Merge branch 'master' of https://github.com/lukebpotato/djangae-testapp
Add django 1.6 to the testapp and use that instead of the built-in 1.5