Adding window resizing mappings
Merge branch 'master' of github.com:staskie/dotfiles

Conflicts:
	vim/vimrc