Other alias
Merge branch 'master' of github.com:suderman/local

Conflicts:
	sh/aliases.sh