Add vim-go.
Merge branch 'master' of github.com:dnephin/dotfiles

Conflicts:
	.kde/share/config/kglobalshortcutsrc
	.purple/prefs.xml