Resolved 2.x merge conflicts

# By Vincent Prouillet
# Via Vincent Prouillet
* '2.x' of github.com:Snugug/gulp-sass:
  Use plugin name const in logError

# Conflicts:
#	index.js

index.js

@@ -91,7 +91,7 @@ gulpSass.sync = function sync(options) {
 // Log errors nicely
 //////////////////////////////
 gulpSass.logError = function logError(error) {
-  gutil.log(gutil.colors.red('[gulp-sass] ') + error.message);
+  gutil.log(gutil.colors.red('[' + PLUGIN_NAME + '] ') + error.message);
 };
 
 module.exports = gulpSass;