Merge https://github.com/aztec8/yellr

Conflicts:
	website/test/leaflet.draw.js
	website/test/leaflet.js
	website/test/map.html
commit all the things laying around
merge conflicts with origin master, assumed local is authoritative.
Merge branch 'october-hackathon'