Merge branch 'master' into adapters

Conflicts:
	src/rivets.coffee

@@ -2,7 +2,7 @@
   "name": "rivets",
   "name": "rivets",
   "repo": "mikeric/rivets",
   "repo": "mikeric/rivets",
   "description": "Declarative data binding facility.",
   "description": "Declarative data binding facility.",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "keywords": ["data binding", "templating"],
   "keywords": ["data binding", "templating"],
   "scripts": ["dist/rivets.js"],
   "scripts": ["dist/rivets.js"],
   "main": "dist/rivets.js",
   "main": "dist/rivets.js",

 // Rivets.js
 // Rivets.js
-// version: 0.5.12
+// version: 0.5.13
 // author: Michael Richards
 // author: Michael Richards
 // license: MIT
 // license: MIT
 (function() {
 (function() {
-  var Rivets,
+  var Rivets, jQuery,
     __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     __slice = [].slice,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __hasProp = {}.hasOwnProperty,
@@ -12,6 +12,8 @@
 
 
   Rivets = {};
   Rivets = {};
 
 
+  jQuery = window.jQuery || window.Zepto;
+
   if (!String.prototype.trim) {
   if (!String.prototype.trim) {
     String.prototype.trim = function() {
     String.prototype.trim = function() {
       return this.replace(/^\s+|\s+$/g, '');
       return this.replace(/^\s+|\s+$/g, '');
@@ -319,7 +321,7 @@
       this.build = __bind(this.build, this);
       this.build = __bind(this.build, this);
       this.componentRegExp = __bind(this.componentRegExp, this);
       this.componentRegExp = __bind(this.componentRegExp, this);
       this.bindingRegExp = __bind(this.bindingRegExp, this);
       this.bindingRegExp = __bind(this.bindingRegExp, this);
-      if (!(this.els.jquery || this.els instanceof Array)) {
+      if (typeof this.els.length === 'undefined') {
         this.els = [this.els];
         this.els = [this.els];
       }
       }
       _ref = ['config', 'binders', 'formatters'];
       _ref = ['config', 'binders', 'formatters'];

 {
 {
   "name": "rivets",
   "name": "rivets",
   "description": "Declarative data binding facility.",
   "description": "Declarative data binding facility.",
-  "version": "0.5.12",
+  "version": "0.5.13",
   "author": "Michael Richards",
   "author": "Michael Richards",
   "url": "http://rivetsjs.com",
   "url": "http://rivetsjs.com",
   "main": "./dist/rivets.js",
   "main": "./dist/rivets.js",