Update defaults to use VIM instead of VI, enable color for
diffs