HouseTrip/rufus-runner — pull request #3 by kratob (2013-07-24 09:19:08+00:00)
Title: Fix: Options merged incorrectly

If you do

```ruby
Rufus::TrackingScheduler.start :timeout => 60 do |scheduler|
scheduler.run :timeout => 20 do
...
end
end
```

the `:timeout => 60` wins. This PR fixes that.