Merge Upstream, Other forks

[Orochimarufan]

The few upstream changes that happened since the fork should be merged (http://sourceforge.net/p/pythonqt/code/248/log/)

Also, maybe the other forks (at https://github.com/commontk/PythonQt/network) have things that are worth merging

[mantaraya36]

There seems to be a PythonQt version 3 branch in the original repo, maybe worth looking at?