ctrol w o
Merge branch 'master' of https://github.com/cernalpanic/vim

Conflicts:
	vimrc