natural=bay (fix #119)
natural=peak (fix #120)
dy on waterway labels
text wrap on peak labels
Allow labels to be close to airport icon (fix #58)
Merge branch 'master' of https://github.com/hotosm/HDM-CartoCSS