Replaced GEOIP_CITY_DATA with OPENID_FILESTORE_LOCATION
Updated templates to  make better use of template inheritence

400.html and 500.html have not been updated