Added Vundle for https://github.com/nsf/gocode.
Merge branch 'master' of github.com:hreese/dotfiles

Conflicts:
	.vimrc
My .oh-my-zsh wins