comint fixes
Merge branch 'master' of https://github.com/bjourne/ConfigurationFiles

Conflicts:
	dot-emacs