Merge pull request #7 from bergundy/master

sync countries from geonames
Fixed unit tests and reduced test data amount
removed deprecated llocations
change countries getter names to getCountry{X}By{Y}