ignoring swaneets config notes
Merge branch 'master' into ipython