Lots of minor updates and tweaks.  Starting to implement additional safety checks.
Lots of minor tweaks, starting to implement new safety checks.
Merge branch 'master' of github.com:gabrielsjoberg/dotfiles

Conflicts:
	bash/bashrc
	git/gitconfig