Re-introduce MapType config option - turns out there is still a valid use-case. Removed Core ns from test app
Update the 4.0 readme
Merge branch 're_add_map_type_feature'