Bring over aliases from work
update

update

update

update
Merge branch 'master' of github.com:ffleming/dotfiles
update