Change 'diffopt' values
Change 'os' variable to script-local
Make backups/undos more cross-platform
Move os detection code earlier in the file
Update wildignore settings
Add in settings to restore terminal display on exit
Update ctrlp settings
Update rainbow parentheses colors
Merge branch 'feature/tweaking_vim_settings' into develop