update dotfiles
Merge branch 'master' of https://github.com/briandavidwetzel/dotfiles

Conflicts:
	.bash_profile