changed map to D3, edits to cities are done via a json file under /assets/d3data. Only ethereum-specific meetups should go in there
Merge branch 'master' of https://github.com/holon000/ethereum-plexus

Conflicts:
	views/includes/join.jade