Add some settings for the Go language
Merge branch 'master' of git+ssh://github.com/mw/dots

Conflicts:
	vimrc