few map changes. added fish markets and tidied up
Merge remote-tracking branch 'origin/master' into paa2jpg