Merge my vim config files repo with this one