a little code cleanup and a test for issue #35
don't need this file
test confirming that google.ca works (got a report on the mailing list that it was having problems)
Merge remote-tracking branch 'origin/master'