ignore vim bundle files
go plugins for vim
Merge branch 'master' of github:clalimarmo/dotfiles

Conflicts:
	.vim/pathogen-plugins.yml