Cleaned up logging.  Removed some commented code.
Merge pull request #2 from skrenek/master

Logging cleanup