mapbox.js
re-track db seeds
merge conflict, reindent