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

Conflicts:
	.gitmodules
	bash_aliases
	zsh_aliases