Change locator.getIndexPath() -> getBamIndexPath in log statement
Tweak MainTest so it no longer gets flagged by Sophos (we hope)

Have local file URLs get URL-decoded when input on command line
Merge remote-tracking branch upstream/$:{upbranch}