more emacs cleanup
more cleanup
More tweaks
Merge branch 'master' of https://github.com/puzl/rcm

Conflicts:
	bash/bash.d/bash_profile.clearcase
	emacs/dotemacs
	emacs/emacs-init.el