Merge branch 'geolocation' of https://github.com/fjallarefur/vimb.

diff --cc doc/vimb.1
Simple merge

diff --cc src/main.c
Simple merge

diff --cc src/setting.c
Simple merge