added multiple cities and moved secure keys into secrets_token.rb
Merge branch 'albert'