Changed to ipython. Works perfectly now.
Merge branch 'master' of github.com:psibi/dotfiles

Conflicts:
	.emacs.d/python.el