Revert "shipit.config should be prioritized for remoteCopy command."

This reverts commit 0ec98e8.

lib/shipit.js

@@ -240,10 +240,9 @@ Shipit.prototype.remoteCopy = function (src, dest, options, callback) {
     options = undefined;
   }
 
-  options = options || {};
-  options = _.assign({}, options, {
-    ignores: this.config && this.config.ignores ? this.config.ignores : options.ignores || [],
-    rsync: this.config && this.config.rsync ? this.config.rsync : options.rsync || [] 
+  options = _.defaults(options || {}, {
+    ignores: this.config && this.config.ignores ? this.config.ignores : [],
+    rsync: this.config && this.config.rsync ? this.config.rsync : []
   });
 
   return this.pool.copy(src, dest, options, callback);

test/shipit.js

@@ -105,15 +105,14 @@ describe('Shipit', function () {
       });
     });
 
-    it('should support options specified in shipit.config', function () {
+    it('should support options specified in config', function () {
       shipit.config = {
         ignores: ['foo'],
         rsync: ['--bar']
       };
 
       shipit.remoteCopy('src', 'dest', {
-        direction: 'remoteToLocal',
-        rsync: '--foo'
+        direction: 'remoteToLocal'
       });
 
       expect(shipit.pool.copy).to.be.calledWith('src', 'dest', {
@@ -122,18 +121,5 @@ describe('Shipit', function () {
         rsync: ['--bar']
       });
     });
-
-    it('should support options specified in options parameter', function () {
-      shipit.remoteCopy('src', 'dest', {
-        direction: 'remoteToLocal',
-        rsync: '--foo'
-      });
-
-      expect(shipit.pool.copy).to.be.calledWith('src', 'dest', {
-        direction: 'remoteToLocal',
-        ignores: [],
-        rsync: '--foo' 
-      });
-    });
   });
 });