Add golang specific lines
Merge branch 'master' of https://github.com/palmnet/vimrc

Conflicts:
	.vimrc