vimrc: map ,l and ,h to switch pane, remove the original mapping of rspec

Conflicts:
	vimrc
Merge branch 'master' into ubuntu