Normalized option handling

sass.js

@@ -68,14 +68,12 @@ var deprecatedRender = function(css, callback, options) {
   options.success = function(css) {
     callback(null, css);
   };
-  options.data = css;
-  return binding.render(options);
+  return binding.render(css, options.imagePath, options.success, options.error, options.paths, options.style, options.comments);
 };
 
 var deprecatedRenderSync = function(css, options) {
   options = prepareOptions(options);
-  options.data = css;
-  return binding.renderSync(options);
+  return binding.renderSync(css, options.imagePath, options.paths, options.style, options.comments);
 };
 
 exports.render = function(options) {
@@ -86,11 +84,11 @@ exports.render = function(options) {
   options = prepareOptions(options);
 
   if (options.file) {
-    return binding.renderFile(options);
+    return binding.renderFile(options.file, options.imagePath, options.success, options.error, options.paths, options.style, options.comments, options.sourceMap);
   }
 
   //Assume data is present if file is not. binding/libsass will tell the user otherwise!
-  return binding.render(options);
+  return binding.render(options.data, options.imagePath, options.success, options.error, options.paths, options.style);
 };
 
 exports.renderSync = function(options) {
@@ -101,11 +99,11 @@ exports.renderSync = function(options) {
   options = prepareOptions(options);
 
   if (options.file) {
-    return binding.renderFileSync(options);
+    return binding.renderFileSync(options.file, options.imagePath, options.paths, options.style, options.comments);
   }
 
   //Assume data is present if file is not. binding/libsass will tell the user otherwise!
-  return binding.renderSync(options);
+  return binding.renderSync(options.data, options.imagePath, options.paths, options.style);
 };
 
 /**