Improve tree-filter and env keys

Allow default key for encryption to be indicated
in environment variable.
Merge remote-tracking branch 'origin/master' into editdocs