misc cleanup
Merge pull request #40 from dimagi/cleanup

misc cleanup