Add commandline argument to specify number of skipped images in merge routine
Add commandline argument to specify maximum distance in pixels for matching
Merge branch 'master' of https://github.com/mavmap/mavmap