Added vimrc
Added vim-go
Merge branch 'master' of github.com:gehrhorn/dotfiles

Conflicts:
	vimrc