Adding conditionals for some aliases.
Merge branch 'master' of github.com:cjfrisz/dotfiles