bundle install, more tmux config
FixMerge branch 'master' of https://github.com/javonharper/dotfiles

Conflicts:
	tmux.conf