routes nearly drawable and editable
Merge branch 'master' of https://github.com/spanner/fellrace2
post clean-up fixing