update aliases
Merge branch 'master' of https://github.com/danielgrigg/bash-hub

Conflicts:
	bash_profile