resolve hot-key confict between vim and tmux
Merge remote-tracking branch 'origin/master' into ubuntu

Conflicts:
	tmux.conf