The important stuff is here.
Merge branch 'master' of https://github.com/sixtonspacefly/pydev
We did stuff and they did stuff.