Corrected labeling of cities. Closes #53
Removed stale styles, updated previous changes for print version
Better rendering of natural=spring, drinking-tap made blue. Closes #48