bash.bashrc: CAEN variable included to have umich server name
Merge branch 'master' of github.com:jaybh/config_files

Conflicts:
	bash.bashrc