Added stuff
Merge branch 'master' of https://github.com/pripman/vimfiles

Conflicts:
	.vimrc