Replacing incorrect parsing of Yahoo search results and moving common logic for searching Yahoo into a single helper function. Fixes #1.