Merging mathtext changes into trunk.
remove trailing spaces
revert part of previous commit
expand tabs and remove trailing spaces
pyparsing update, setuptools, and scipy mlab fix
mathtext performance enhancements
reorganizes py code