Add fix for broken case statement indentation for vim.
Fix indentation.
Cleanup bootstrap.