Update
Merge branch 'master' of github.com:indiche/vimfiles

Conflicts:
	vimrc
Fix vimrc