Delete contrib suggestion, as the best format is still up in the air.
Add note about diamond inheritance