Combining two most needed updates

https://github.com/socialreferral/omniauth-google/commit/f5d8ec39924485d
3947b3363ef6925e7cced143b

https://github.com/callumlocke/omniauth-google/commit/8115e1bdd04f479810
8e65468e7c4a7a42598427