Aliases and stuff
Merge branch 'master' of github.com:MasterMic/dotfiles