Dotfile updates.
Merge branch 'master' of github.com:rsclark2/system-configs

Conflicts:
	.bash_profile