added back the general metafeatures that were split also into…

added back the general metafeatures that were split also into numeric/categorical. Also removed third layer of nesting in the random_tree metafeature.