Fixes two problems with Substation

1. substation -> sub_station.
2. Substations are usually  buildings (doesn't apply to points unfortunately).
Remove building tag
Merge branch 'refs/heads/Vanuan-sub_station'