meh
Merge branch 'master' of https://github.com/sshmru/dotvim

Conflicts:
	vimrc