Add not_trash scope
Merge pull request #131 from meliborn/develop

Add not_trash scope
Merge pull request #1 from ging/master

Merge master in before issuing pull request.