Switch back to removing all trailing whitespace
Disable two plugins and update localvimrc settings
Better colors for vimdiff
Add sneak plugin