Small fixes and indentations

* A very small fix for servers with no url2 defined
Added country support and server cache

* Servers are now cached for 60 seconds - faster load
* Can now specify country with -c or --country to limit the test