Merge branch 'master' of https://github.com/lukebpotato/djangae
Don't import from django until the paths have been setup