remove clear history in tmux (conflicting with vim pane switching)
Merge branch 'master' of github.com:patmood/dotfiles
Merge branch 'master' of github.com:patmood/dotfiles
Merge branch 'master' of github.com:patmood/dotfiles

Conflicts:
	.tmux.conf
Merge branch 'master' of github.com:patmood/dotfiles