Halfway to vespucci 0.9.7

https://www.openstreetmap.org/user/SimonPoole/diary/35547