Merge branch 'master' of https://github.com/lukebpotato/djangae
Clean up weird git merge crazyness