fail sooner if user passes in a bad locator strategy (fix #1539)
make sure we extract the right file from the zip (fix #1557)
Merge pull request #1573 from jlipps/master

misc fixes