Merge branch 'resque:master' into master

AUTHORS.md

@@ -56,6 +56,7 @@ Resque Scheduler authors
 - Nickolas Means
 - Olek Janiszewski
 - Olivier Brisse
+- Patrick MacMurchy
 - Petteri Räty
 - Phil Cohen
 - Rob Olson

README.md

@@ -28,7 +28,7 @@ Resque.enqueue_at(5.days.from_now, SomeJob, argument) # runs a job at a specific
 
 This `README` covers what most people need to know.  If you're looking
 for details on individual methods, you might want to try the
-[rdoc](http://rdoc.info/github/resque/resque-scheduler/master/frames).
+[rubydoc](https://rubydoc.info/github/resque/resque-scheduler/master/frames).
 
 ### Installation
 
@@ -86,7 +86,7 @@ namespace :resque do
     # If your schedule already has +queue+ set for each job, you don't
     # need to require your jobs.  This can be an advantage since it's
     # less code that resque-scheduler needs to know about. But in a small
-    # project, it's usually easier to just include you job classes here.
+    # project, it's usually easier to just include your job classes here.
     # So, something like this:
     require 'jobs'
   end