Add matchmaker
Move umimpaired-style mappings to vimrc
Update autofold