WIP improving vim files
Merge branch 'master' of ssh://github.com/caetanus/vimfiles

Conflicts:
	.vimrc
new version.