Various changes
Some vim mappings