better shunting
Merge branch 'master' of https://github.com/Kevin-P-Kerr/ngress

Conflicts:
	shunt.js