Merge branch '6.1' of https://github.com/zurb/foundation-sites into abide

diff --cc js/foundation.abide.js
index 966fbfe80db323c01590f21bf565e6f986735537,9247c10bff90f4deb7914ce0316a02ba1f198a0d..1f3f7ac2abf794b3480084d00af0b8a2c9980726
--- 1/js/foundation.abide.js
--- 2/js/foundation.abide.js
+++ b/js/foundation.abide.js
@@@ -11,10 -11,14 +11,10 @@@
    function Abide(element, options) {
      this.$element = element;
      this.options  = $.extend({}, Abide.defaults, this.$element.data(), options);
 -    this.$window  = $(window);
 -    this.name     = 'Abide';
 -    this.attr     = 'data-abide';
  
      this._init();
 -    this._events();
  
-     Foundation.registerPlugin(this);
+     Foundation.registerPlugin(this, 'Abide');
    }
  
    /**