Fix partials with locals

features/partials.feature

@@ -28,3 +28,8 @@ Feature: Provide Sane Defaults for Partial Behavior
     Given the Server is running at "partials-app"
     When I go to "/sub/index.html"
     Then I should see "Local Partial"
+
+  Scenario: Partials can be passed locals
+    Given the Server is running at "partials-app"
+    When I go to "/locals.html"
+    Then I should see "Local var is bar"

fixtures/partials-app/source/_locals.erb

@@ -0,0 +1 @@
+Local var is <%= foo %>

fixtures/partials-app/source/locals.html.erb

@@ -0,0 +1 @@
+<%= partial 'locals', :locals => { :foo => 'bar' } %>

lib/middleman/core_extensions/rendering.rb

@@ -57,9 +57,11 @@ module Middleman::CoreExtensions::Rendering
     end
     
     # Sinatra/Padrino render method signature.
-    def render(engine, data, options={}, locals={}, &block)
+    def render(engine, data, options={}, &block)
       data = data.to_s
 
+      locals = options[:locals]
+
       found_partial = false
       engine        = nil