Fix up the ability to require as a gem, with modern bundler/ruby