Updated ipython
Update words
Merge branch 'master' of github.com:JohnReid/dotfiles