Do another energy minimization after annealing

This simple change turns out to make a big difference.  With 306 test files processed, 97% of all tests passed, and 91% of files passed every time.