Worry not about themes, we're running in a TERM again.

export TERM=screen-256color
Allow interactive merge for magit.
Merge branch 'master' of github.banksimple.com:will/dotfiles