added vim-golang from https://github.com/jnwhiteh/vim-golang
Merge branch 'master' into laptop