Remove molokai; add additional vim plugin tweaks