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

Conflicts:
	bash_aliases