Merge pull request #480 from jeremygray/master

TEST: polygon contains, overlaps: use the same window throughout
Merge pull request #481 from jeremygray/master

test some more lines of code
TEST: log=False to reduce log lines during tests