add some aliases and stuff
Merge branch 'master' of github.com:gkoo/dotfiles