IPython.zmq -> IPython.kernel.zmg
swallow_args moved and some renaming of kernelapp imports
removed the local version of modules we don't have modifications on