IPython update (dirty)
Merge branch 'ahmadia/ipython3' into ahmadia/add_trackpy