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
Merge branch 'master' of https://github.com/oddityoverseer13/openstreetmap-carto into oddityoverseer13-master

Conflicts:
	project.mml
Create a utils folder to hold scripts that aren't routinely needed.
Convert all shops to use markersymbolizer.

Without doing so, the generic marker prevents anything with a specific
pointsymbolizer icon from showing up.
Merge branch 'oddityoverseer13-master'