use winkey for tabs
Merge branch 'master' of github.com:archpollux/dot-vim

Conflicts:
	vimrc