Update to Go 1.1

Simple fixes to compile with Go 1.1 and make golint happy.