Fixes found from the ubuntu vm

Some settings don't work with the main version in the Ubuntu repository, so updated
a few settings to work with both, then added an ignored file called 'local.vim'
(it is touched in the setup script) that will hold settings that are specific to
the local version.