package finder update for pip-pop
Merge remote-tracking branch 'origin/master'
Merge pull request #2 from heroku/master

Pulled from upstream