remove tmux navigator
reinstate vim/tmux navigation
Merge branch 'master' of ssh://github.com-shirku/shirku/vim into mac

Conflicts:
	vimrc