convert to jellybeans colors
launch a tmux inside ratpoison
Merge branch 'master' of https://github.com/markcornick/dotfiles

Conflicts:
	markcornick.terminal