Looks like a recent merge broke indentation there, my change changed it automatically by having this in .vimrc

let g:gofmt_command = "goimports"
au FileType go au BufWritePre <buffer> Fmt

I'll fix up the rest of the commit according to your comments.