Add all the new cool stuff
Do more nonspecific stuff
Merge branch 'master' of https://github.com/christianbundy/dotfiles

Conflicts:
	dotfiles/tmux.conf