Cleanup and addition of some features, adding VIM remapping.