Added ipython to the list of dependencies to install.
Resolved a merge conflict.