Added styles for generic shop=* icon
Removed unnecessary whitespace
Removed auto-inserted tilemill preferences
Changed SQL to render specific values, rather than shop=*
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project.mml
Fixed a couple small typos
Fixed anoter typo
Made a few more changes to support generic shop icons
renamed ruby script to have .rb extension
Added some more values to the shop=* blacklist
Added some more values to the shop= blacklist
Added bags, antique, and pets to the blacklist
Simplified the shop blacklist
Minor readme fixes

Improvements to the markdown and updates now that osm-carto is the standard
Move documentation for contributors to CONTRIBUTING
Clean up waterways

* Merge definitions of canal and river (canals are now as wide as rivers
  instead or wider on some and narrower on other zoomlevels).
* Merge definitions of stream, drain, and ditch.
* Render river/canal in tunnel like stream/drain/ditch in tunnel.
* Render river/canal in tunnel in tunnel-style on z12 and z13.
* Render tunnel=culvert like tunnel=yes.

This solves the following issues:
* Fixes 3590 (trac): Canals wider than rivers at z12, disappear at z11
* Fixes 4227 (trac): canals as tunnels render differently at low zooms
* Fixes 4507 (trac): Waterways in a tunnel may be confused for roads
* Fixes 4656 (trac): waterway=canal too wide compared with highways at z14
* Fixes #198: Add rendering of tunnel=culvert for waterway
* Fixes #222: Inconsistent water-lines-casing tunnel check
* Fixes #282: "waterway=stream" with "tunnel=yes" nearly invisible

With thanks to @yarl for the work on #198.
Make project.mml non-executable

It got changed at some point
Change track name rendering

Add offset and halo
Clean-up paths and tracks, in particular on z13/z14

- Make paths and tracks less visible on z13/z14, by making them narrower and
  remove the casing at these zoomlevels. This declutters in high-density
  environments, while at the same keeping the paths and tracks visible in
  low-density environments.
- Hide private paths and tracks on z13/z14.
- Define path/track widths with variables.
- Make widths of path/track bridges and tunnels more consistent.
- Add rendering for steps in tunnels.
- Add background (glow) to steps, just like footways.

This solves the following issues:
* #211 (Poor result of rendering areas with many footways in zoom level 13)
* #620 (Tracks too dominant on z13)
* Trac 1508: don't render tracks of high tracktype at low zoom (-> wontfix)
* Trac 3788: Don't render highway=track, access=private at z13&14
* Trac 4015: Rendering of highway=path with access=no is inconsistent
* #634: private footways should not be rendered up to z13
 Fix typo in highway areas definition

This solves a typo introduced by me in ccf558f.

This solves unexpected rendering of highway areas.

This solves #730.