small fixes + update

This fixes a small merge glitch that prevents OS X from building.

In addition, I did the following:

- update the python files to include all 2.7.5 changes
- update the python files to include all 3.3.2 changes
- make pickle globals the same way complete (and ugly) as in CPython
- update the DOAP record to 0.5.1 and mention OS X

I successfully ran all tests on OS X.
Hope this request is acceptable and useful.

Cheers - Chris