Update ssh config
Disable bash history navigation

It is causing errors with vim
Use vimdiff as default git merge and diff tool