CLI: Makes compilation data-first.

* Other minor fixes.

bin/node-sass

@@ -5,8 +5,7 @@ var Emitter = require('events').EventEmitter,
     meow = require('meow'),
     replaceExt = require('replace-ext'),
     stdin = require('get-stdin'),
-    render = require('../lib/render'),
-    fs = require('fs');
+    render = require('../lib/render');
 
 /**
  * Initialize CLI
@@ -209,11 +208,10 @@ function run(options, emitter) {
   }
 
   if (options.importer) {
-    if (fs.existsSync(options.importer)) {
+    if ((path.resolve(options.importer) === path.normalize(options.importer).replace(/(.+)([\/|\\])$/, '$1'))) {
       options.importer = require(options.importer);
     } else {
-      console.error('Could not locate importer.');
-      process.exit(1);
+      options.importer = require(path.resolve(process.cwd(), options.importer));
     }
   }
 

lib/render.js

@@ -26,10 +26,10 @@ module.exports = function(options, emitter) {
     importer: options.importer
   };
 
-  if (options.src) {
-    renderOptions.file = options.src;
-  } else if (options.data) {
+  if (options.data) {
     renderOptions.data = options.data;
+  } else if (options.src) {
+    renderOptions.file = options.src;
   }
 
   renderOptions.success = function(result) {

test/fixtures/extras/my_custom_importer_file.js

 var path = require('path');
 
-module.exports = function(file) {console.log('>>>>>>>>>>');console.log(path.resolve(path.join(process.cwd(), 'test/fixtures/include-files/', file + (path.extname(file) ? '' : '.scss'))));
+module.exports = function(file) {
   return {
       file: path.resolve(path.join(process.cwd(), 'test/fixtures/include-files/', file + (path.extname(file) ? '' : '.scss')))
   };