ipython
Merge branch 'mvp' into website-fix

Conflicts:
	reqs/common.txt