Add in Strava link
Merge in news 2013 refactorings
Remove TODO