from go shortcut, it is confilict with google go
Merge branch 'master' of github.com:littleboy85/init

Conflicts:
	vim/.vimrc