Move keys to separate file, not working on osm.org yet.
Add tests for new geo utils
Merge remote-tracking branch 'systemed/master' into labels