Combine diversification and trait code.

Dan Rabosky made changes to the code in order to eliminate
the redundancy between the diversification and trait code.

Carlos Anderson added the appropriate make files based on the
original make files provided by Dan Rabosky.
Remove old diversification and trait code.