Trying to get it to work with the new submodule structure.
Merge branch 'master' of github.com:rockwolf/python

Had some changes on the server.