leisure=marina cleanup.
Put the leisure=marina POI back to the default style.
Remove the leisure=marina polygon.
Add a leisure=marina line to the marine style.

git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@2529 25d90789-57f7-4ee0-8453-03a3dfeeeb22