Sorry I haven't been active in the !hackfest, I've been doing some !mappers stuff instead and learning #Leaflet + interacting with #OSM data structures.
But I'll make sure to merge your stuff! I assume it's all good.