CLeanup
Merge branch 'master' of github.com:alexgtom/dotfiles

Conflicts:
	.vim/vundles.vim