Add initial and final points to trajectory and currents plot.
Fix bad handling of no data loaded.
Merge branch 'develop'