ip now aliased to ipython without matplotlib (performance critical on MacOSX 10.10)
Merge branch 'master' of github.com:jdoppler/dotfiles