Revert "Optionally use global optimization for box optimization."

This reverts commit 98747262a7922c5acf5ebd6dd01c909c1fd81606.

The global optimization is probably useless because local optimization
finds the same end result in my testing and is needed anyway to refine
the global optimization.
Fix scaling of non-orthorhombic boxes.