small cleanup crap
Merge branch 'master' of github.com:mcclurem/configs

Conflicts:
	.bash_profile
git aliases