Setup fully updated to version 2.0.
Merge branch 'master' into python2.3
Python 3.1 and 3.3 now work, with NumPy 1.7.1.
Merge branch 'master' into python2.3