Forked to add back vim support