2D: use the same loss for choosing points and loss_improvement

Bas Nijholtrequested to merge
2d_loss_fix into master

This seems to work really badly:

Screen_Shot_2017-10-04_at_12.46.36

Merge request reports