removed users isp field, use last_jam_locidispid%1000000 instead; added fields for state and country codes.

db/manifest

@@ -160,3 +160,4 @@ periodic_emails.sql
 remember_extra_scoring_data.sql
 indexing_for_regions.sql
 latency_tester.sql
+fix_users_location_fields.sql

db/up/fix_users_location_fields.sql

@@ -0,0 +1,5 @@
+ALTER TABLE users DROP COLUMN addr;
+ALTER TABLE users DROP COLUMN locidispid;
+ALTER TABLE users DROP COLUMN internet_service_provider;
+ALTER TABLE users ADD COLUMN statecode varchar(2);
+ALTER TABLE users ADD COLUMN countrycode varchar(2);