Fixed conflicts and merged

Lots of stuff needs to be changed to use the new win conditions and I
have no idea how the split or double down code works to actually make it
work right.