updated
removed some unused alias crutches
Merge branch 'master' of github.com:zbtirrell/dotfiles

Conflicts:
	.bashrc