Using goimports for Go
Merge branch 'master' of github.com:hillmanov/vimrc

Conflicts:
	.vimrc