merge from master
Make vim undodir during setup
improve mappings, better hinttags, map hotkeys more broadly
merge with parent