Merge pull request #53 from Pardot/mf/pdt-5578

[PDT-5578] Clean up ExecutorIterator
[PDT-5578] Fix bug in count without filtering