Clean up logging
Merge pull request #57 from callahad/logging-cleanup

Clean up logging