Set VimL to use four spaces.
Added a check for stray bundle configuration.