Update to Python 2.7.5, 3.2.5 and 3.3.2
Update to PyPy 2.0
Merge remote-tracking branch 'upstream/master'