Last minute changes.
Merge pull request #1 from ipython/master

Last minute changes.