Preparation for gofer 2.0 in f21 and beyond.

Gofer 2.0 included in Fedora 21 and 22 (and beyond) will have some minor API incompatibilities.