set vim keybindings
add switch client shortcut
Merge branch 'master' of github.com:thomaspeklak/dotfiles

Conflicts:
	tmux.conf
	zshrc