Minor reordering of vim configuration