Moved Cluster class to inherit from Entity and tested.

Also moved __cmp__ from cluster to entity since it compares on the name, and that should be the default.