Changes to norm determination

 - only consider non-error control choices in the norm-determination
   stage.
 - fix nonlin_min optimiser to report errors
 - add a test for 2D controls