osm tag parsing improved
Merge branch 'master' of https://github.com/CartoDB/showcase-maps

Conflicts:
	nightofmuseums/index.html
Merge branch 'master' into gh-pages