blah blah tmux blah blah
stuff.
update iterm2 stuff I guess
Switch from pathogen to vundle
Merge branch 'master' of github.com:benley/dotfiles

Conflicts:
	bin/benlib.sh
	ssh/config
add conque-shell, pythoncomplete bundles