travis and golint fixes