fix axes for rebinning, and set c++ to default

[jdmulligan]

Rebinning should now work in C++ -- I just essentially reverted to the original way of specifying binnings, since something was mixed up.

Did some simple testing and all looks good -- but please check that you reproduce results @ezradlesser