More features brought in from my vim config