Remove/replace last references to github.com/matttproud/...