Limestone feature cleanup pass. Config added.
Merge pull request #35 from laod/master

Limestone feature cleanup pass. Config added.