Merge pull request #151 from parkouss/master

fix test on bisector now that persist format has changed
Merge pull request #152 from parkouss/master

revert some of the work done in "bug1019528 - use of cachecontrol" since it breaks inbound hunting