Added a combo_id field to each class and simplified Butterfly and IronCondor.