Add new travel extents and spindle mapping
Merge branch 'merge_helper2' of github.com:omco/g2 into merge_helper2