Update to 2.x.x combinators

[gavinp]

Combinators in base factorio now have many more options. Colour selection, multiple expressions and multiple outputs. There's a new type of combinator, too.