Further improved Golden Cookie banking

Now estimates Golden Cookie contributions to CPS;
Now will only buy things if they increase CPS more  than they decrease
CPS from Golden Cookies;
Refactored out magic upgrade IDs