pushing ipython stuff.
merged