another round of preset cleanups:
* improve search terms, and remove some which were redundant
* add many missing presets under `shop=*` (from wiki)
* remove `vertex` geometry from many building-like presets