remove layer field from waterway=stream
add `place=suburb`, but named Borough
Merge pull request #2180 from bhousel/bhousel-presets

Presets