Unify and fix help magic
Merge branch 'master' of https://github.com/blink1073/jupyter_kernel

Conflicts:
	jupyter_kernel/magickernel.py
	jupyter_kernel/tests/test_magickernel.py