Updates
Merge branch 'master' of https://github.com/clarkduvall/dotfiles

Conflicts:
	.bashrc