Planetary and Proto-Planetary Nebulae: From IRAS to ISO