Added strava upload support - still needs testing - and tidied things up a bit for the rest