update logging to allow for levels
Merge branch 'master' into logging-changes
Merge pull request #62 from hayes/logging-changes

allow log levels