Add more dirs to install dirs.
Update trash to trash-cli.
Merge branch 'develop' of github.com:pixelastic/oroshi into develop