Add hook functions for text and sh modes.
Merge branch 'master' of github.com:murshies/emacs

Conflicts:
	.emacs