shorten the js section names
Merge branch 'js-generic' into js-test-refact

Conflicts:
	IPython/testing/iptestcontroller.py