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
added first pass at push query
rough, not working
new docs
Merge pull request #2 from danhammer/feature/carto-push

Feature/carto push