Numerous updates to locations_json with fixes for english names
Tweets now contain more city names and limit the amount of tweets per alarm to no more than 2 tweets