ipython
Merge branch 'master' of github.com:jra3/dot-emacs