Use another icon for spring; could still be better
Rework and extend infrastructure category

- Add water subcategory with well, water tower, wastewater plant and
  water works
- Add power subcategory with substation, transformer, plant and
  generator
- Add communications category, with comm. towers
Wider name for water_well
Add moretags for water tower
Add bunch of power generation moretags

TODO: generator_type dictionary still to be populated
Add bunch of substation/transformer moretags