add .gitignore
Changed golang package
Merge branch 'master' of https://github.com/yongzhy/vimconfig

Conflicts:
	.gitmodules