Merge pull request #1106 from jviney/master

Fix use of run_callbacks in Rails 4

Rails 4 removed the second argument from `run_callback`.

lib/paperclip/callbacks.rb

@@ -22,8 +22,8 @@ module Paperclip
     end
     end
 
 
     module Running
     module Running
-      def run_paperclip_callbacks(callback, opts = nil, &block)
-        run_callbacks(callback, opts, &block)
+      def run_paperclip_callbacks(callback, &block)
+        run_callbacks(callback, &block)
       end
       end
     end
     end
   end
   end