Issue #36
- More cleaning up of output and logging
Issue
Issue #44
- Fixed log marker placement by taking them out of standard output and
not using tee (separate output for log)