Renamed most of the routines.
Merge branch 'master' of https://github.com/psheehan/pdspy