vimrc update
Merge branch 'master' of github.com:antekone/vimscripts

Conflicts:
	.vimrc