Merge pull request #1 from xellepher/origin

Device information maintained

DataSegments now use datapoints which are further apart as the Start and End point. Provides a much smoother power curve!
speed fixes
pulling conflict out.
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	Strava Centurion/IO/TcxDataSegmentReader.cs
Add the speed fix back in.
Merge pull request #2 from mjervis/origin

merge from mjervis origin