Clear up the merge and move mechanics

There's still a bug with some planets going wild and gaining absurd
speeds, but overall it works better. If you place two planets, they will
actually both start moving towards the other, instead of just one.