Merge pull request #67 from mdlayher/master

Fixed a bunch of error logging, cleaned up some mixed tabs/spaces