add aliases
Merge branch 'master' of https://github.com/fitztrev/trevdev

Conflicts:
	shell/.aliases