Switch to github.com/fluffle/golog for logging
Merge branch 'master' into uncodin