Added styles for generic shop=* icon
Removed unnecessary whitespace
Removed auto-inserted tilemill preferences
Changed SQL to render specific values, rather than shop=*
Fix extent

This solves #554
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
Only show track and pitch outline at zoom >= 15
Merge pull request #629 from vholten/sportsfields

Only show track and pitch outline at zoom >= 15
Force names of national parks inside polygon

This solves #613.
Move rendering of miniroundabouts to z16

This solves #598.
Also fix mercator extents
Switch to a SVG for the parking icon.

Because this is such a simple icon, it's easy to write the SVG for it by hand.

This allows us to only use one symbol file for both parking and private parking, and set the colour in the stylesheet.
Fix parking icon alignment to pixel bounds

The round part of the P was half a pixel off.