cleanup
more cleanup
Merge pull request #1 from jenterkin/master

Cleanup and API stuff