work
Merge branch 'master' of http://github.com/githuberer/my_vim_conf

Conflicts:
	zshrc
work