Preserve the options hash when not a params object

Before this change, if the second argument was not a params object,
`options` would be set to false. As a Hash responds to `.to_h` just send
it before the merge no matter what.

Fixes zombocom#205

lib/wicked/controller/concerns/path.rb

@@ -1,7 +1,6 @@
 module Wicked::Controller::Concerns::Path
   extend ActiveSupport::Concern
 
-
   def next_wizard_path(options = {})
     wizard_path(@next_step, options)
   end
@@ -18,14 +17,12 @@ def wicked_action
     params[:action]
   end
 
-
   def wizard_path(goto_step = nil, options = {})
-    options = options.to_h if options.respond_to?(:permitted?) && options.respond_to?(:to_h)
     options = { :controller => wicked_controller,
                 :action     => 'show',
                 :id         => goto_step || params[:id],
                 :only_path  => true
-               }.merge options
+    }.merge options.to_h
     url_for(options)
   end
 end