added resources path
fixed merge conflict
added prep-values
cleaned up convert-entries
fix cartodb-clj
adjusting prep-vals
Merge branch 'feature/carto-push' of github.com:danhammer/mongabay-clj into feature/carto-push
site updates
wire border
added first pass at push query
added infowindow
some stuff
enabled query clear button
buttons wired
buttons wired
 more fixes
rough, not working
new docs
Merge pull request #2 from danhammer/feature/carto-push

Feature/carto push
baselayer change