Tidy up y axis on ErgFilePlot

.. it was a bit messy and yRight 1+2 should have
   been hidden from view.
Revert "Fix SEGV on bad file/header in FitRideFile"

This reverts commit c8e1f95114100440b72cbc0ea27a8aea7637cfe4.
Another attempt to fix SEGV in FitRideFile

.. when the file is zero length or the header is truncated.
merge upstream into master
merge master into personal