remove some old crap I left in there
Merge branch 'shuttle-merge'

Conflicts:
	imenu-many.el