Modified tmux.conf, gitconfig, and xinitrc, along with starting to switch Chris' mutt config over to my accounts.
Merge branch 'master' of https://github.com/colinmahns/dotfiles

Conflicts:
	tmux.conf
poop