enc.dir(foo) now does *not* want "/encounters/" as part of the passed base dir -- it adds it by itself.
Merge remote-tracking branch 'refs/remotes/origin/master' into whaleshark.org