Consolidate conflicting map styling

Combine a number of conflicting/duplicated styling rules between main.scss and _map.scss.

@ctaylo37 will need to take a look; when looking at the pop-ups, please also check that the address search pop-ups look okay (they don't have the styled header sections on them).