Some misc dev cleanup
Merge pull request #37 from pconerly/dev-cleanup

Some misc dev cleanup