Use logging and ensure it gets to the right place.
Merge pull request #111 from bigkevmcd/minor-improvements

Use logging and ensure it gets to the right place.
Merge master.