Fixed loading of window settings

Previous changes fixed the loading of local settings such thath the
vimrc file would always be preferred.  Unfortunately the window specific
settings were being handled different that local settings when it came
to the vimrc file.

I fixed this by both unifying the handling and inserting common choke
points for the settings.