Changes and fixes in vim setup and corresponding scripts.