Fixes and changes
Merge branch 'master' of github.com:chernesk/vim-config

Conflicts:
	.vimrc