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
render beach from z9
Minor readme fixes

Improvements to the markdown and updates now that osm-carto is the standard
Move documentation for contributors to CONTRIBUTING
Change POIs displayed at z15 and z16 as discussed on #689

makes #70 less severe or maybe even fixed
follow CartoCSS Style Guidelines
"Always specify zoom levels as either >= or < . Don't use = or =< or >"
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