Cleanup of ri.vim, fixes #16