lots of changes.
Merge branch 'master' of https://github.com/hardythe1/SciPy2013