Code review comment for lp:~marco-gallotta/ibid/flight

Please merge trunk's plugin-reorg into this branch, and then merge your plugin into the geography plugin (preserving as much history as you can, please).