muokattu vimrc-tiedostoja
Merge branch 'master' of https://github.com/laite/dotvim

Conflicts:
	vimrc.local.hp
ladattu vundle