Erm.
Merge branch 'master' of https://github.com/nipy/nitime