most trusted alias
Merge branch 'work' of github.com:bmcorser/dotfiles into work

Conflicts:
	alias