Revert "Reorganize vimrc (again)"

This reverts commit c9c6c251cb9c8399b9e501fb3ef29fc08fa95c47.