Style tags need to be in the template tag and property cleanup for 2.0

[maartenst]

This is a pull request with fix from findings from running leaflet-map in polymer 2.0. Both fixes should also work in Polymer 1 I think, but be sure to test.