add pulgin setting
modify tmux.conf
update vimrc
add new plugin
Merge branch 'master' of github.com:bananapenguin/dotfiles

Conflicts:
	vimrc