Turned off backup and swap. Almost always using Git
Tidy up of sections in vimrc and minor tweaks