fixed trash-cli.sh
modified functions
Merge branch 'master' of https://github.com/emanon-was/.dotfiles