Add golang syntax
Merge branch 'master' of github.com:coarsesand/dotfiles

Conflicts:
	vim/after/plugin/vundle.vim