Merge remote-tracking branch 'upstream/staging' into map
merge from upstream (map refactor)
fix to map grid plotting which got lost in refactor
fixed bug in plotting of compositemaps
Merge pull request #489 from ehsteve/map

A few bug fix for refactor and plotting