Presets

* remove layer field from waterway=stream (see #2087)
* add `place=suburb`, but named Borough (for #2175)