Added sun and mercury

Removed Pluto for now so don't compile Charon.