merge master into personal
Merge branch 'personal' of http://github.com/andybryson/GoldenCheetah into personal