add C+left/right for tab switching
Merge branch 'master' of github.com:andreashappe/vimrc

Conflicts:
	tmux.conf