TimeoutError is deprecated in Ruby 2.3.0. It has been an alias for
Timeout::Error starting in Ruby 1.8.0, and should be safe to replace.

https://developer.yahoo.com/boss/placefinder/

the Yahoo lookup will be fully removed via:
https://github.com/alexreisner/geocoder/pull/985

I just spent a few hours trying to get this function to work, then realized I had my parameters in the wrong order. I was following the order listed in the comment, rather than the actual method definition! *facepalm* Anyhow, this fixes the comment, for the next person to read it.

This reverts commit 97b6bb94.

Move away from generating a `geocoder.rb` initializer with old school ruby hash syntax in favor of the new/current style.