updates, with vim tmux navigator
Merge branch 'master' of github.com:johnmarkli/dotfiles

Conflicts:
	bashrc
	tmux.conf