Merge pull request #1 from ipython/master

merge with upstream