Added 'deleted' alias.
Expand all the short options like '-s' to long ones like '--short'
Merge branch 'master' of github.com:kablamo/dotfiles