more aliases
Merge branch 'master' of github.com:robmcguinness/dotfiles

Conflicts:
	.aliases