+ tidy up
Merge branch 'master-merge' of https://github.com/cyclestreets/ios into master-merge