Update wiki link
Add Twitter link
Update site source
Merge branch 'public' into 3000
Update to latest geonames/opentraveldata data
Minor bump version (new data)
Merge branch 'public' into 3000