Merged work from soroban into palamedes
Merge pull request #1 from socrata/master

Merged work from soroban into palamedes