Make logging configurable - #265
Merge pull request #319 from daleharvey/configurable-log

Make logging configurable - #265