Set mergetool to diffconflicts & set pull to do rebase by default.
Tidy up tmux.conf, chuck out lots of unnecessary bindings.