Updates all over the place

Adds Google stuff, Facebook, CityGrid