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