Added go and updated vimrc
merge with master/origin