[WIP] Adjust to upstream interface changes in g2s

Depends on peterbourgon/g2s#7

**Verndored dependency g2s needs to be update as soon as upstream is merged**