pull
Merge branch 'master' of https://github.com/githuberer/my_vim_conf

Conflicts:
	gvimrc