Merge pull request #58 from captdeaf/master

Fixes for Tim's restructuring.
Merge pull request #59 from captdeaf/master

Removing unnecessary log
Forcing go message structure