Reorder and clean-up of vim plugins