Remove jedivim settings
Merge branch 'master' of github.com:Joowani/rcs

Conflicts:
	vimrc