Use French-style tree rendering

Merge tree rendering style developed by @cquest for French rendering, see
https://github.com/cquest/osmfr-cartocss/.

* Resolves #138
* Resolves #838
Is there no other way to draw a circle around a point than buffering and a fill?