Blue waters commit
Merge branch 'master' of github.com:leeping/etc

Conflicts:
	bashrc
	emacs
	vmdrc