Update to ipython 3

For the most part, fixed against ipython master. Will fix as issues come up now.