resolve conflict
Cmake path, minor .bashrc change.
Merge branch 'master' of ssh://cz-stash.llnl.gov:7999/~gamblin2/dotfiles

Conflicts:
	home/.bash.d/1path.sh