remove some duplication
Small simplification
Merge branch 'master' of github.com:flack/openpsa
Small simplification in directory listing logic