Tidy up map.js and op2geojson.js
Merge remote-tracking branch 'fodaro/master'

Conflicts:
	resources/map.js