Updated tox.ini for local testing.
tox.ini: removed optional dependencies.
Merge branch 'master' into basic-jython-fixes

Fixed Conflicts:
	IPython/utils/process.py
Merge pull request #6319 from cel4/update_tox_ini

Updated tox.ini for local testing.
Merge commit '470094a22479f6cee7ae31cc855442743a87176b' into basic-jython-fixes
Merge branch 'basic-jython-fixes' into zmq-jeromq-abstraction