Force 256 colors in tmux
Changed mergetool to vimdiff
Added list and listchars options (commmented out)