Logging + Misc cleanup

Let's switch globally in a separate PR. (You mean this, right? https://github.com/golang/glog/)