Fix merge errors, clean outfile, return absolute path from fixture_path

This patch corrects the failing test in Ruby 1.8.7, among other things.