fixed merge conflict to get upstream changes.
Added What3Words (http://what3words.com) geocoder and unittests.
added What3Words reverse geocoder and tests