Better Vim support

General tweaks for Vim support, especially proper indenting.