some more flavors of Encounter.dir()
more patching of encounter directories to allow for new uuid-based paths
Merge remote-tracking branch 'refs/remotes/origin/master' into whaleshark.org