Allow map to absorb options from mergeOptions. Fixes #829
Merge pull request #869 from mapbox/merge-options

Allow map to absorb options from mergeOptions. Fixes #829