Added some useful aliases
Merge branch 'master' of github.com:sgolestane/dotfiles