Added .python suffix to all scopes that were missing it
Remove some Django stuff, try to improve tuple matching
Merge branch 'master' of github.com:MattDMo/PythonImproved