removing the custom view mode from the .module file
back to using hook entity info alter
Merge branch 'master' into 7.x-1.x

Conflicts:
	toc_formatter.module