Minor cleanup and fix; add require_relative to Gemfile