random changes
Merge branch 'master' of github.com:smav/.vim

Conflicts:
	.vimrc-vundle