Updates
Merge branch 'master' of https://github.com/antew/vim-conf

Conflicts:
	.vimrc