fixes to merging in option.rb
remove debugging from driver.rb
improve error reporting from driver.rb
fixes to options spec