this was an edit to the dev branch from vim by Blake.