Separate water line text into its own layer.

Fixes longstanding issues of river names appearing below admin
boundaries, bridges etc.

Also fixes #106