diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 108308b8..a45ccdd7 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -13,11 +13,13 @@ module.exports = (grunt) ->
   grunt.loadNpmTasks('grunt-contrib-uglify')
   grunt.loadNpmTasks('grunt-contrib-watch')
   grunt.loadNpmTasks('grunt-release')
+  grunt.loadNpmTasks('grunt-karma')
 
   grunt.initConfig
 
     pkg: '<json:package.json>'
     distFolder: 'dist'
+    testFolder: 'test'
 
     jst:
       all:
@@ -63,5 +65,11 @@ module.exports = (grunt) ->
     release:
       npm: false
 
+    karma:
+      unit:
+        configFile: '<%= testFolder %>/karma.conf.coffee'
+
+
   grunt.registerTask 'default', ALL_TASKS
   grunt.registerTask 'dist', ['cssmin:dist', 'uglify:dist']
+  grunt.registerTask 'test', ['dist', 'karma']
diff --git a/bower.json b/bower.json
index 8a3044ec..21f361ac 100644
--- a/bower.json
+++ b/bower.json
@@ -6,7 +6,7 @@
     "adamjacobbecker <ad@mbecker.cc>"
   ],
   "description": "Graphical form builder for the web.",
-  "main": "dist",
+  "main": "index.js",
   "license": "MIT",
   "ignore": [
     "**/.*",
@@ -16,14 +16,14 @@
     "tests"
   ],
   "dependencies": {
-    "jquery": "*",
-    "jquery-ui": "*",
+    "jquery": "~2.0.3",
+    "jquery-ui": "~1.10.3",
     "jquery.scrollWindowTo": "https://gist.github.com/adamjacobbecker/6519570/raw/cd741057495d0fb19e545a0f9a098efba3bef9c8/jquery.scrollWindowTo.js",
-    "underscore": "*",
+    "underscore": "~1.5.2",
     "underscore.mixin.deepExtend": "https://gist.github.com/adamjacobbecker/6519561/raw/63682037af9b10200b05c1a3d5890903397b2103/underscore.mixin.deepExtend.js",
-    "backbone": "*",
-    "backbone-deep-model": "*",
-    "rivets": "*",
-    "font-awesome": "~4.0.1"
+    "backbone": "~1.1.0",
+    "backbone-deep-model": "~0.10.4",
+    "rivets": "~0.5.13",
+    "font-awesome": "~3.2.1"
   }
-}
+}
\ No newline at end of file
diff --git a/bower_components/backbone-deep-model/.bower.json b/bower_components/backbone-deep-model/.bower.json
index 5fcad0cc..731c929f 100644
--- a/bower_components/backbone-deep-model/.bower.json
+++ b/bower_components/backbone-deep-model/.bower.json
@@ -9,6 +9,6 @@
     "commit": "709ca367afa864253517f05690984179a0504664"
   },
   "_source": "git://github.com/powmedia/backbone-deep-model.git",
-  "_target": "*",
+  "_target": "~0.10.4",
   "_originalSource": "backbone-deep-model"
 }
\ No newline at end of file
diff --git a/bower_components/backbone/.bower.json b/bower_components/backbone/.bower.json
index 998f6b4e..7cc42d12 100644
--- a/bower_components/backbone/.bower.json
+++ b/bower_components/backbone/.bower.json
@@ -1,14 +1,14 @@
 {
   "name": "backbone",
   "homepage": "https://github.com/jashkenas/backbone",
-  "version": "1.0.0",
-  "_release": "1.0.0",
+  "version": "1.1.0",
+  "_release": "1.1.0",
   "_resolution": {
     "type": "version",
-    "tag": "1.0.0",
-    "commit": "699fe3271262043bb137bae97bd0003d6d193f27"
+    "tag": "1.1.0",
+    "commit": "0a4399e3de5cb2ab75a0338669582f18c1fae3ae"
   },
   "_source": "git://github.com/jashkenas/backbone.git",
-  "_target": "*",
+  "_target": "~1.1.0",
   "_originalSource": "backbone"
 }
\ No newline at end of file
diff --git a/bower_components/backbone/CONTRIBUTING.md b/bower_components/backbone/CONTRIBUTING.md
index 5f4ff1a4..55403616 100644
--- a/bower_components/backbone/CONTRIBUTING.md
+++ b/bower_components/backbone/CONTRIBUTING.md
@@ -1,15 +1,20 @@
-## How to contribute to Backbone.js
+## How to Open a Backbone.js Ticket
+
+* Do not use tickets to ask for help with (debugging) your application. Ask on
+the [mailing list](https://groups.google.com/forum/#!forum/backbonejs), 
+in the IRC channel (`#documentcloud` on Freenode), or if you understand your 
+specific problem, on [StackOverflow](http://stackoverflow.com/questions/tagged/backbone.js).
 
 * Before you open a ticket or send a pull request,
-[search](https://github.com/documentcloud/backbone/issues) for previous
+[search](https://github.com/jashkenas/backbone/issues) for previous
 discussions about the same feature or issue. Add to the earlier ticket if you
 find one.
 
 * Before sending a pull request for a feature or bug fix, be sure to have
-[tests](http://backbonejs.org/test/test.html).
+[tests](http://backbonejs.org/test/).
 
 * Use the same coding style as the rest of the
-[codebase](https://github.com/documentcloud/backbone/blob/master/backbone.js).
+[codebase](https://github.com/jashkenas/backbone/blob/master/backbone.js).
 
 * In your pull request, do not add documentation or rebuild the minified
 `backbone-min.js` file. We'll do that before cutting a new release.
diff --git a/bower_components/backbone/README.md b/bower_components/backbone/README.md
index 75aa0780..7b0482df 100644
--- a/bower_components/backbone/README.md
+++ b/bower_components/backbone/README.md
@@ -1,26 +1,29 @@
-     ____                     __      __                                                 
-    /\  _`\                  /\ \    /\ \                                   __           
-    \ \ \ \ \     __      ___\ \ \/'\\ \ \____    ___     ___      __      /\_\    ____  
-     \ \  _ <'  /'__`\   /'___\ \ , < \ \ '__`\  / __`\ /' _ `\  /'__`\    \/\ \  /',__\ 
+     ____                     __      __
+    /\  _`\                  /\ \    /\ \                                   __
+    \ \ \ \ \     __      ___\ \ \/'\\ \ \____    ___     ___      __      /\_\    ____
+     \ \  _ <'  /'__`\   /'___\ \ , < \ \ '__`\  / __`\ /' _ `\  /'__`\    \/\ \  /',__\
       \ \ \ \ \/\ \ \.\_/\ \__/\ \ \\`\\ \ \ \ \/\ \ \ \/\ \/\ \/\  __/  __ \ \ \/\__, `\
        \ \____/\ \__/.\_\ \____\\ \_\ \_\ \_,__/\ \____/\ \_\ \_\ \____\/\_\_\ \ \/\____/
-        \/___/  \/__/\/_/\/____/ \/_/\/_/\/___/  \/___/  \/_/\/_/\/____/\/_/\ \_\ \/___/ 
-                                                                           \ \____/      
-                                                                            \/___/       
+        \/___/  \/__/\/_/\/____/ \/_/\/_/\/___/  \/___/  \/_/\/_/\/____/\/_/\ \_\ \/___/
+                                                                           \ \____/
+                                                                            \/___/
     (_'_______________________________________________________________________________'_)
     (_.———————————————————————————————————————————————————————————————————————————————._)
-                                               
-                                              
+
+
 Backbone supplies structure to JavaScript-heavy applications by providing models key-value binding and custom events, collections with a rich API of enumerable functions, views with declarative event handling, and connects it all to your existing application over a RESTful JSON interface.
 
 For Docs, License, Tests, pre-packed downloads, and everything else, really, see:
 http://backbonejs.org
 
 To suggest a feature, report a bug, or general discussion:
-http://github.com/documentcloud/backbone/issues/
+http://github.com/jashkenas/backbone/issues
+
+Backbone is an open-sourced component of DocumentCloud:
+https://github.com/documentcloud
 
-All contributors are listed here:
-http://github.com/documentcloud/backbone/contributors
+Many thanks to our contributors:
+http://github.com/jashkenas/backbone/contributors
 
-Special thanks to Robert Kieffer for the original philosophy behind Backbone. 
+Special thanks to Robert Kieffer for the original philosophy behind Backbone.
 http://github.com/broofa
diff --git a/bower_components/backbone/Rakefile b/bower_components/backbone/Rakefile
deleted file mode 100644
index e9723648..00000000
--- a/bower_components/backbone/Rakefile
+++ /dev/null
@@ -1,24 +0,0 @@
-desc "rebuild the backbone-min.js files for distribution"
-task :build do
-  check 'uglifyjs', 'UglifyJS', 'https://github.com/mishoo/UglifyJS2'
-  system 'uglifyjs backbone.js --source-map backbone-min.map -o backbone-min.js'
-end
-
-desc "build the docco documentation"
-task :doc do
-  check 'docco', 'docco', 'https://github.com/jashkenas/docco'
-  system 'docco backbone.js && docco examples/todos/todos.js examples/backbone.localstorage.js'
-end
-
-desc "run JavaScriptLint on the source"
-task :lint do
-  check 'jsl', 'JavaScript Lint', 'http://www.javascriptlint.com/'
-  system "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
-end
-
-# Check for the existence of an executable.
-def check(exec, name, url)
-  return unless `which #{exec}`.empty?
-  puts "#{name} not found.\nInstall it from #{url}"
-  exit
-end
diff --git a/bower_components/backbone/backbone-min.js b/bower_components/backbone/backbone-min.js
index 7243e5f0..3b2593dd 100644
--- a/bower_components/backbone/backbone-min.js
+++ b/bower_components/backbone/backbone-min.js
@@ -1,4 +1,2 @@
-(function(){var root=this;var previousBackbone=root.Backbone;var array=[];var push=array.push;var slice=array.slice;var splice=array.splice;var Backbone;if(typeof exports!=="undefined"){Backbone=exports}else{Backbone=root.Backbone={}}Backbone.VERSION="1.0.0";var _=root._;if(!_&&typeof require!=="undefined")_=require("underscore");Backbone.$=root.jQuery||root.Zepto||root.ender||root.$;Backbone.noConflict=function(){root.Backbone=previousBackbone;return this};Backbone.emulateHTTP=false;Backbone.emulateJSON=false;var Events=Backbone.Events={on:function(name,callback,context){if(!eventsApi(this,"on",name,[callback,context])||!callback)return this;this._events||(this._events={});var events=this._events[name]||(this._events[name]=[]);events.push({callback:callback,context:context,ctx:context||this});return this},once:function(name,callback,context){if(!eventsApi(this,"once",name,[callback,context])||!callback)return this;var self=this;var once=_.once(function(){self.off(name,once);callback.apply(this,arguments)});once._callback=callback;return this.on(name,once,context)},off:function(name,callback,context){var retain,ev,events,names,i,l,j,k;if(!this._events||!eventsApi(this,"off",name,[callback,context]))return this;if(!name&&!callback&&!context){this._events={};return this}names=name?[name]:_.keys(this._events);for(i=0,l=names.length;i<l;i++){name=names[i];if(events=this._events[name]){this._events[name]=retain=[];if(callback||context){for(j=0,k=events.length;j<k;j++){ev=events[j];if(callback&&callback!==ev.callback&&callback!==ev.callback._callback||context&&context!==ev.context){retain.push(ev)}}}if(!retain.length)delete this._events[name]}}return this},trigger:function(name){if(!this._events)return this;var args=slice.call(arguments,1);if(!eventsApi(this,"trigger",name,args))return this;var events=this._events[name];var allEvents=this._events.all;if(events)triggerEvents(events,args);if(allEvents)triggerEvents(allEvents,arguments);return this},stopListening:function(obj,name,callback){var listeners=this._listeners;if(!listeners)return this;var deleteListener=!name&&!callback;if(typeof name==="object")callback=this;if(obj)(listeners={})[obj._listenerId]=obj;for(var id in listeners){listeners[id].off(name,callback,this);if(deleteListener)delete this._listeners[id]}return this}};var eventSplitter=/\s+/;var eventsApi=function(obj,action,name,rest){if(!name)return true;if(typeof name==="object"){for(var key in name){obj[action].apply(obj,[key,name[key]].concat(rest))}return false}if(eventSplitter.test(name)){var names=name.split(eventSplitter);for(var i=0,l=names.length;i<l;i++){obj[action].apply(obj,[names[i]].concat(rest))}return false}return true};var triggerEvents=function(events,args){var ev,i=-1,l=events.length,a1=args[0],a2=args[1],a3=args[2];switch(args.length){case 0:while(++i<l)(ev=events[i]).callback.call(ev.ctx);return;case 1:while(++i<l)(ev=events[i]).callback.call(ev.ctx,a1);return;case 2:while(++i<l)(ev=events[i]).callback.call(ev.ctx,a1,a2);return;case 3:while(++i<l)(ev=events[i]).callback.call(ev.ctx,a1,a2,a3);return;default:while(++i<l)(ev=events[i]).callback.apply(ev.ctx,args)}};var listenMethods={listenTo:"on",listenToOnce:"once"};_.each(listenMethods,function(implementation,method){Events[method]=function(obj,name,callback){var listeners=this._listeners||(this._listeners={});var id=obj._listenerId||(obj._listenerId=_.uniqueId("l"));listeners[id]=obj;if(typeof name==="object")callback=this;obj[implementation](name,callback,this);return this}});Events.bind=Events.on;Events.unbind=Events.off;_.extend(Backbone,Events);var Model=Backbone.Model=function(attributes,options){var defaults;var attrs=attributes||{};options||(options={});this.cid=_.uniqueId("c");this.attributes={};_.extend(this,_.pick(options,modelOptions));if(options.parse)attrs=this.parse(attrs,options)||{};if(defaults=_.result(this,"defaults")){attrs=_.defaults({},attrs,defaults)}this.set(attrs,options);this.changed={};this.initialize.apply(this,arguments)};var modelOptions=["url","urlRoot","collection"];_.extend(Model.prototype,Events,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(options){return _.clone(this.attributes)},sync:function(){return Backbone.sync.apply(this,arguments)},get:function(attr){return this.attributes[attr]},escape:function(attr){return _.escape(this.get(attr))},has:function(attr){return this.get(attr)!=null},set:function(key,val,options){var attr,attrs,unset,changes,silent,changing,prev,current;if(key==null)return this;if(typeof key==="object"){attrs=key;options=val}else{(attrs={})[key]=val}options||(options={});if(!this._validate(attrs,options))return false;unset=options.unset;silent=options.silent;changes=[];changing=this._changing;this._changing=true;if(!changing){this._previousAttributes=_.clone(this.attributes);this.changed={}}current=this.attributes,prev=this._previousAttributes;if(this.idAttribute in attrs)this.id=attrs[this.idAttribute];for(attr in attrs){val=attrs[attr];if(!_.isEqual(current[attr],val))changes.push(attr);if(!_.isEqual(prev[attr],val)){this.changed[attr]=val}else{delete this.changed[attr]}unset?delete current[attr]:current[attr]=val}if(!silent){if(changes.length)this._pending=true;for(var i=0,l=changes.length;i<l;i++){this.trigger("change:"+changes[i],this,current[changes[i]],options)}}if(changing)return this;if(!silent){while(this._pending){this._pending=false;this.trigger("change",this,options)}}this._pending=false;this._changing=false;return this},unset:function(attr,options){return this.set(attr,void 0,_.extend({},options,{unset:true}))},clear:function(options){var attrs={};for(var key in this.attributes)attrs[key]=void 0;return this.set(attrs,_.extend({},options,{unset:true}))},hasChanged:function(attr){if(attr==null)return!_.isEmpty(this.changed);return _.has(this.changed,attr)},changedAttributes:function(diff){if(!diff)return this.hasChanged()?_.clone(this.changed):false;var val,changed=false;var old=this._changing?this._previousAttributes:this.attributes;for(var attr in diff){if(_.isEqual(old[attr],val=diff[attr]))continue;(changed||(changed={}))[attr]=val}return changed},previous:function(attr){if(attr==null||!this._previousAttributes)return null;return this._previousAttributes[attr]},previousAttributes:function(){return _.clone(this._previousAttributes)},fetch:function(options){options=options?_.clone(options):{};if(options.parse===void 0)options.parse=true;var model=this;var success=options.success;options.success=function(resp){if(!model.set(model.parse(resp,options),options))return false;if(success)success(model,resp,options);model.trigger("sync",model,resp,options)};wrapError(this,options);return this.sync("read",this,options)},save:function(key,val,options){var attrs,method,xhr,attributes=this.attributes;if(key==null||typeof key==="object"){attrs=key;options=val}else{(attrs={})[key]=val}if(attrs&&(!options||!options.wait)&&!this.set(attrs,options))return false;options=_.extend({validate:true},options);if(!this._validate(attrs,options))return false;if(attrs&&options.wait){this.attributes=_.extend({},attributes,attrs)}if(options.parse===void 0)options.parse=true;var model=this;var success=options.success;options.success=function(resp){model.attributes=attributes;var serverAttrs=model.parse(resp,options);if(options.wait)serverAttrs=_.extend(attrs||{},serverAttrs);if(_.isObject(serverAttrs)&&!model.set(serverAttrs,options)){return false}if(success)success(model,resp,options);model.trigger("sync",model,resp,options)};wrapError(this,options);method=this.isNew()?"create":options.patch?"patch":"update";if(method==="patch")options.attrs=attrs;xhr=this.sync(method,this,options);if(attrs&&options.wait)this.attributes=attributes;return xhr},destroy:function(options){options=options?_.clone(options):{};var model=this;var success=options.success;var destroy=function(){model.trigger("destroy",model,model.collection,options)};options.success=function(resp){if(options.wait||model.isNew())destroy();if(success)success(model,resp,options);if(!model.isNew())model.trigger("sync",model,resp,options)};if(this.isNew()){options.success();return false}wrapError(this,options);var xhr=this.sync("delete",this,options);if(!options.wait)destroy();return xhr},url:function(){var base=_.result(this,"urlRoot")||_.result(this.collection,"url")||urlError();if(this.isNew())return base;return base+(base.charAt(base.length-1)==="/"?"":"/")+encodeURIComponent(this.id)},parse:function(resp,options){return resp},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return this.id==null},isValid:function(options){return this._validate({},_.extend(options||{},{validate:true}))},_validate:function(attrs,options){if(!options.validate||!this.validate)return true;attrs=_.extend({},this.attributes,attrs);var error=this.validationError=this.validate(attrs,options)||null;if(!error)return true;this.trigger("invalid",this,error,_.extend(options||{},{validationError:error}));return false}});var modelMethods=["keys","values","pairs","invert","pick","omit"];_.each(modelMethods,function(method){Model.prototype[method]=function(){var args=slice.call(arguments);args.unshift(this.attributes);return _[method].apply(_,args)}});var Collection=Backbone.Collection=function(models,options){options||(options={});if(options.url)this.url=options.url;if(options.model)this.model=options.model;if(options.comparator!==void 0)this.comparator=options.comparator;this._reset();this.initialize.apply(this,arguments);if(models)this.reset(models,_.extend({silent:true},options))};var setOptions={add:true,remove:true,merge:true};var addOptions={add:true,merge:false,remove:false};_.extend(Collection.prototype,Events,{model:Model,initialize:function(){},toJSON:function(options){return this.map(function(model){return model.toJSON(options)})},sync:function(){return Backbone.sync.apply(this,arguments)},add:function(models,options){return this.set(models,_.defaults(options||{},addOptions))},remove:function(models,options){models=_.isArray(models)?models.slice():[models];options||(options={});var i,l,index,model;for(i=0,l=models.length;i<l;i++){model=this.get(models[i]);if(!model)continue;delete this._byId[model.id];delete this._byId[model.cid];index=this.indexOf(model);this.models.splice(index,1);this.length--;if(!options.silent){options.index=index;model.trigger("remove",model,this,options)}this._removeReference(model)}return this},set:function(models,options){options=_.defaults(options||{},setOptions);if(options.parse)models=this.parse(models,options);if(!_.isArray(models))models=models?[models]:[];var i,l,model,attrs,existing,sort;var at=options.at;var sortable=this.comparator&&at==null&&options.sort!==false;var sortAttr=_.isString(this.comparator)?this.comparator:null;var toAdd=[],toRemove=[],modelMap={};for(i=0,l=models.length;i<l;i++){if(!(model=this._prepareModel(models[i],options)))continue;if(existing=this.get(model)){if(options.remove)modelMap[existing.cid]=true;if(options.merge){existing.set(model.attributes,options);if(sortable&&!sort&&existing.hasChanged(sortAttr))sort=true}}else if(options.add){toAdd.push(model);model.on("all",this._onModelEvent,this);this._byId[model.cid]=model;if(model.id!=null)this._byId[model.id]=model}}if(options.remove){for(i=0,l=this.length;i<l;++i){if(!modelMap[(model=this.models[i]).cid])toRemove.push(model)}if(toRemove.length)this.remove(toRemove,options)}if(toAdd.length){if(sortable)sort=true;this.length+=toAdd.length;if(at!=null){splice.apply(this.models,[at,0].concat(toAdd))}else{push.apply(this.models,toAdd)}}if(sort)this.sort({silent:true});if(options.silent)return this;for(i=0,l=toAdd.length;i<l;i++){(model=toAdd[i]).trigger("add",model,this,options)}if(sort)this.trigger("sort",this,options);return this},reset:function(models,options){options||(options={});for(var i=0,l=this.models.length;i<l;i++){this._removeReference(this.models[i])}options.previousModels=this.models;this._reset();this.add(models,_.extend({silent:true},options));if(!options.silent)this.trigger("reset",this,options);return this},push:function(model,options){model=this._prepareModel(model,options);this.add(model,_.extend({at:this.length},options));return model},pop:function(options){var model=this.at(this.length-1);this.remove(model,options);return model},unshift:function(model,options){model=this._prepareModel(model,options);this.add(model,_.extend({at:0},options));return model},shift:function(options){var model=this.at(0);this.remove(model,options);return model},slice:function(begin,end){return this.models.slice(begin,end)},get:function(obj){if(obj==null)return void 0;return this._byId[obj.id!=null?obj.id:obj.cid||obj]},at:function(index){return this.models[index]},where:function(attrs,first){if(_.isEmpty(attrs))return first?void 0:[];return this[first?"find":"filter"](function(model){for(var key in attrs){if(attrs[key]!==model.get(key))return false}return true})},findWhere:function(attrs){return this.where(attrs,true)},sort:function(options){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");options||(options={});if(_.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(_.bind(this.comparator,this))}if(!options.silent)this.trigger("sort",this,options);return this},sortedIndex:function(model,value,context){value||(value=this.comparator);var iterator=_.isFunction(value)?value:function(model){return model.get(value)};return _.sortedIndex(this.models,model,iterator,context)},pluck:function(attr){return _.invoke(this.models,"get",attr)},fetch:function(options){options=options?_.clone(options):{};if(options.parse===void 0)options.parse=true;var success=options.success;var collection=this;options.success=function(resp){var method=options.reset?"reset":"set";collection[method](resp,options);if(success)success(collection,resp,options);collection.trigger("sync",collection,resp,options)};wrapError(this,options);return this.sync("read",this,options)},create:function(model,options){options=options?_.clone(options):{};if(!(model=this._prepareModel(model,options)))return false;if(!options.wait)this.add(model,options);var collection=this;var success=options.success;options.success=function(resp){if(options.wait)collection.add(model,options);if(success)success(model,resp,options)};model.save(null,options);return model},parse:function(resp,options){return resp},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(attrs,options){if(attrs instanceof Model){if(!attrs.collection)attrs.collection=this;return attrs}options||(options={});options.collection=this;var model=new this.model(attrs,options);if(!model._validate(attrs,options)){this.trigger("invalid",this,attrs,options);return false}return model},_removeReference:function(model){if(this===model.collection)delete model.collection;model.off("all",this._onModelEvent,this)},_onModelEvent:function(event,model,collection,options){if((event==="add"||event==="remove")&&collection!==this)return;if(event==="destroy")this.remove(model,options);if(model&&event==="change:"+model.idAttribute){delete this._byId[model.previous(model.idAttribute)];if(model.id!=null)this._byId[model.id]=model}this.trigger.apply(this,arguments)}});var methods=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","indexOf","shuffle","lastIndexOf","isEmpty","chain"];_.each(methods,function(method){Collection.prototype[method]=function(){var args=slice.call(arguments);args.unshift(this.models);return _[method].apply(_,args)}});var attributeMethods=["groupBy","countBy","sortBy"];_.each(attributeMethods,function(method){Collection.prototype[method]=function(value,context){var iterator=_.isFunction(value)?value:function(model){return model.get(value)};return _[method](this.models,iterator,context)}});var View=Backbone.View=function(options){this.cid=_.uniqueId("view");this._configure(options||{});this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var delegateEventSplitter=/^(\S+)\s*(.*)$/;var viewOptions=["model","collection","el","id","attributes","className","tagName","events"];_.extend(View.prototype,Events,{tagName:"div",$:function(selector){return this.$el.find(selector)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(element,delegate){if(this.$el)this.undelegateEvents();this.$el=element instanceof Backbone.$?element:Backbone.$(element);this.el=this.$el[0];if(delegate!==false)this.delegateEvents();return this},delegateEvents:function(events){if(!(events||(events=_.result(this,"events"))))return this;this.undelegateEvents();for(var key in events){var method=events[key];if(!_.isFunction(method))method=this[events[key]];if(!method)continue;var match=key.match(delegateEventSplitter);var eventName=match[1],selector=match[2];method=_.bind(method,this);eventName+=".delegateEvents"+this.cid;if(selector===""){this.$el.on(eventName,method)}else{this.$el.on(eventName,selector,method)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_configure:function(options){if(this.options)options=_.extend({},_.result(this,"options"),options);_.extend(this,_.pick(options,viewOptions));this.options=options},_ensureElement:function(){if(!this.el){var attrs=_.extend({},_.result(this,"attributes"));if(this.id)attrs.id=_.result(this,"id");if(this.className)attrs["class"]=_.result(this,"className");var $el=Backbone.$("<"+_.result(this,"tagName")+">").attr(attrs);this.setElement($el,false)}else{this.setElement(_.result(this,"el"),false)}}});Backbone.sync=function(method,model,options){var type=methodMap[method];_.defaults(options||(options={}),{emulateHTTP:Backbone.emulateHTTP,emulateJSON:Backbone.emulateJSON});var params={type:type,dataType:"json"};if(!options.url){params.url=_.result(model,"url")||urlError()}if(options.data==null&&model&&(method==="create"||method==="update"||method==="patch")){params.contentType="application/json";params.data=JSON.stringify(options.attrs||model.toJSON(options))}if(options.emulateJSON){params.contentType="application/x-www-form-urlencoded";params.data=params.data?{model:params.data}:{}}if(options.emulateHTTP&&(type==="PUT"||type==="DELETE"||type==="PATCH")){params.type="POST";if(options.emulateJSON)params.data._method=type;var beforeSend=options.beforeSend;options.beforeSend=function(xhr){xhr.setRequestHeader("X-HTTP-Method-Override",type);if(beforeSend)return beforeSend.apply(this,arguments)}}if(params.type!=="GET"&&!options.emulateJSON){params.processData=false}if(params.type==="PATCH"&&window.ActiveXObject&&!(window.external&&window.external.msActiveXFilteringEnabled)){params.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var xhr=options.xhr=Backbone.ajax(_.extend(params,options));model.trigger("request",model,xhr,options);return xhr};var methodMap={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};Backbone.ajax=function(){return Backbone.$.ajax.apply(Backbone.$,arguments)};var Router=Backbone.Router=function(options){options||(options={});if(options.routes)this.routes=options.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var optionalParam=/\((.*?)\)/g;var namedParam=/(\(\?)?:\w+/g;var splatParam=/\*\w+/g;var escapeRegExp=/[\-{}\[\]+?.,\\\^$|#\s]/g;_.extend(Router.prototype,Events,{initialize:function(){},route:function(route,name,callback){if(!_.isRegExp(route))route=this._routeToRegExp(route);if(_.isFunction(name)){callback=name;name=""}if(!callback)callback=this[name];var router=this;Backbone.history.route(route,function(fragment){var args=router._extractParameters(route,fragment);callback&&callback.apply(router,args);router.trigger.apply(router,["route:"+name].concat(args));router.trigger("route",name,args);Backbone.history.trigger("route",router,name,args)});return this},navigate:function(fragment,options){Backbone.history.navigate(fragment,options);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=_.result(this,"routes");var route,routes=_.keys(this.routes);while((route=routes.pop())!=null){this.route(route,this.routes[route])}},_routeToRegExp:function(route){route=route.replace(escapeRegExp,"\\$&").replace(optionalParam,"(?:$1)?").replace(namedParam,function(match,optional){return optional?match:"([^/]+)"}).replace(splatParam,"(.*?)");return new RegExp("^"+route+"$")},_extractParameters:function(route,fragment){var params=route.exec(fragment).slice(1);return _.map(params,function(param){return param?decodeURIComponent(param):null})}});var History=Backbone.History=function(){this.handlers=[];_.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var routeStripper=/^[#\/]|\s+$/g;var rootStripper=/^\/+|\/+$/g;var isExplorer=/msie [\w.]+/;var trailingSlash=/\/$/;History.started=false;_.extend(History.prototype,Events,{interval:50,getHash:function(window){var match=(window||this).location.href.match(/#(.*)$/);return match?match[1]:""},getFragment:function(fragment,forcePushState){if(fragment==null){if(this._hasPushState||!this._wantsHashChange||forcePushState){fragment=this.location.pathname;var root=this.root.replace(trailingSlash,"");if(!fragment.indexOf(root))fragment=fragment.substr(root.length)}else{fragment=this.getHash()}}return fragment.replace(routeStripper,"")},start:function(options){if(History.started)throw new Error("Backbone.history has already been started");History.started=true;this.options=_.extend({},{root:"/"},this.options,options);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var fragment=this.getFragment();var docMode=document.documentMode;var oldIE=isExplorer.exec(navigator.userAgent.toLowerCase())&&(!docMode||docMode<=7);this.root=("/"+this.root+"/").replace(rootStripper,"/");if(oldIE&&this._wantsHashChange){this.iframe=Backbone.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo("body")[0].contentWindow;this.navigate(fragment)}if(this._hasPushState){Backbone.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!oldIE){Backbone.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=fragment;var loc=this.location;var atRoot=loc.pathname.replace(/[^\/]$/,"$&/")===this.root;if(this._wantsHashChange&&this._wantsPushState&&!this._hasPushState&&!atRoot){this.fragment=this.getFragment(null,true);this.location.replace(this.root+this.location.search+"#"+this.fragment);return true}else if(this._wantsPushState&&this._hasPushState&&atRoot&&loc.hash){this.fragment=this.getHash().replace(routeStripper,"");this.history.replaceState({},document.title,this.root+this.fragment+loc.search)}if(!this.options.silent)return this.loadUrl()},stop:function(){Backbone.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);History.started=false},route:function(route,callback){this.handlers.unshift({route:route,callback:callback})},checkUrl:function(e){var current=this.getFragment();if(current===this.fragment&&this.iframe){current=this.getFragment(this.getHash(this.iframe))}if(current===this.fragment)return false;if(this.iframe)this.navigate(current);this.loadUrl()||this.loadUrl(this.getHash())},loadUrl:function(fragmentOverride){var fragment=this.fragment=this.getFragment(fragmentOverride);var matched=_.any(this.handlers,function(handler){if(handler.route.test(fragment)){handler.callback(fragment);return true}});return matched},navigate:function(fragment,options){if(!History.started)return false;if(!options||options===true)options={trigger:options};fragment=this.getFragment(fragment||"");if(this.fragment===fragment)return;this.fragment=fragment;var url=this.root+fragment;if(this._hasPushState){this.history[options.replace?"replaceState":"pushState"]({},document.title,url)}else if(this._wantsHashChange){this._updateHash(this.location,fragment,options.replace);if(this.iframe&&fragment!==this.getFragment(this.getHash(this.iframe))){if(!options.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,fragment,options.replace)}}else{return this.location.assign(url)}if(options.trigger)this.loadUrl(fragment)},_updateHash:function(location,fragment,replace){if(replace){var href=location.href.replace(/(javascript:|#).*$/,"");location.replace(href+"#"+fragment)}else{location.hash="#"+fragment}}});Backbone.history=new History;var extend=function(protoProps,staticProps){var parent=this;var child;if(protoProps&&_.has(protoProps,"constructor")){child=protoProps.constructor}else{child=function(){return parent.apply(this,arguments)}}_.extend(child,parent,staticProps);var Surrogate=function(){this.constructor=child};Surrogate.prototype=parent.prototype;child.prototype=new Surrogate;if(protoProps)_.extend(child.prototype,protoProps);child.__super__=parent.prototype;return child};Model.extend=Collection.extend=Router.extend=View.extend=History.extend=extend;var urlError=function(){throw new Error('A "url" property or function must be specified')};var wrapError=function(model,options){var error=options.error;options.error=function(resp){if(error)error(model,resp,options);model.trigger("error",model,resp,options)}}}).call(this);
-/*
-//@ sourceMappingURL=backbone-min.map
-*/
\ No newline at end of file
+(function(){var t=this;var e=t.Backbone;var i=[];var r=i.push;var s=i.slice;var n=i.splice;var a;if(typeof exports!=="undefined"){a=exports}else{a=t.Backbone={}}a.VERSION="1.1.0";var h=t._;if(!h&&typeof require!=="undefined")h=require("underscore");a.$=t.jQuery||t.Zepto||t.ender||t.$;a.noConflict=function(){t.Backbone=e;return this};a.emulateHTTP=false;a.emulateJSON=false;var o=a.Events={on:function(t,e,i){if(!l(this,"on",t,[e,i])||!e)return this;this._events||(this._events={});var r=this._events[t]||(this._events[t]=[]);r.push({callback:e,context:i,ctx:i||this});return this},once:function(t,e,i){if(!l(this,"once",t,[e,i])||!e)return this;var r=this;var s=h.once(function(){r.off(t,s);e.apply(this,arguments)});s._callback=e;return this.on(t,s,i)},off:function(t,e,i){var r,s,n,a,o,u,c,f;if(!this._events||!l(this,"off",t,[e,i]))return this;if(!t&&!e&&!i){this._events={};return this}a=t?[t]:h.keys(this._events);for(o=0,u=a.length;o<u;o++){t=a[o];if(n=this._events[t]){this._events[t]=r=[];if(e||i){for(c=0,f=n.length;c<f;c++){s=n[c];if(e&&e!==s.callback&&e!==s.callback._callback||i&&i!==s.context){r.push(s)}}}if(!r.length)delete this._events[t]}}return this},trigger:function(t){if(!this._events)return this;var e=s.call(arguments,1);if(!l(this,"trigger",t,e))return this;var i=this._events[t];var r=this._events.all;if(i)c(i,e);if(r)c(r,arguments);return this},stopListening:function(t,e,i){var r=this._listeningTo;if(!r)return this;var s=!e&&!i;if(!i&&typeof e==="object")i=this;if(t)(r={})[t._listenId]=t;for(var n in r){t=r[n];t.off(e,i,this);if(s||h.isEmpty(t._events))delete this._listeningTo[n]}return this}};var u=/\s+/;var l=function(t,e,i,r){if(!i)return true;if(typeof i==="object"){for(var s in i){t[e].apply(t,[s,i[s]].concat(r))}return false}if(u.test(i)){var n=i.split(u);for(var a=0,h=n.length;a<h;a++){t[e].apply(t,[n[a]].concat(r))}return false}return true};var c=function(t,e){var i,r=-1,s=t.length,n=e[0],a=e[1],h=e[2];switch(e.length){case 0:while(++r<s)(i=t[r]).callback.call(i.ctx);return;case 1:while(++r<s)(i=t[r]).callback.call(i.ctx,n);return;case 2:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a);return;case 3:while(++r<s)(i=t[r]).callback.call(i.ctx,n,a,h);return;default:while(++r<s)(i=t[r]).callback.apply(i.ctx,e)}};var f={listenTo:"on",listenToOnce:"once"};h.each(f,function(t,e){o[e]=function(e,i,r){var s=this._listeningTo||(this._listeningTo={});var n=e._listenId||(e._listenId=h.uniqueId("l"));s[n]=e;if(!r&&typeof i==="object")r=this;e[t](i,r,this);return this}});o.bind=o.on;o.unbind=o.off;h.extend(a,o);var d=a.Model=function(t,e){var i=t||{};e||(e={});this.cid=h.uniqueId("c");this.attributes={};if(e.collection)this.collection=e.collection;if(e.parse)i=this.parse(i,e)||{};i=h.defaults({},i,h.result(this,"defaults"));this.set(i,e);this.changed={};this.initialize.apply(this,arguments)};h.extend(d.prototype,o,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(t){return h.clone(this.attributes)},sync:function(){return a.sync.apply(this,arguments)},get:function(t){return this.attributes[t]},escape:function(t){return h.escape(this.get(t))},has:function(t){return this.get(t)!=null},set:function(t,e,i){var r,s,n,a,o,u,l,c;if(t==null)return this;if(typeof t==="object"){s=t;i=e}else{(s={})[t]=e}i||(i={});if(!this._validate(s,i))return false;n=i.unset;o=i.silent;a=[];u=this._changing;this._changing=true;if(!u){this._previousAttributes=h.clone(this.attributes);this.changed={}}c=this.attributes,l=this._previousAttributes;if(this.idAttribute in s)this.id=s[this.idAttribute];for(r in s){e=s[r];if(!h.isEqual(c[r],e))a.push(r);if(!h.isEqual(l[r],e)){this.changed[r]=e}else{delete this.changed[r]}n?delete c[r]:c[r]=e}if(!o){if(a.length)this._pending=true;for(var f=0,d=a.length;f<d;f++){this.trigger("change:"+a[f],this,c[a[f]],i)}}if(u)return this;if(!o){while(this._pending){this._pending=false;this.trigger("change",this,i)}}this._pending=false;this._changing=false;return this},unset:function(t,e){return this.set(t,void 0,h.extend({},e,{unset:true}))},clear:function(t){var e={};for(var i in this.attributes)e[i]=void 0;return this.set(e,h.extend({},t,{unset:true}))},hasChanged:function(t){if(t==null)return!h.isEmpty(this.changed);return h.has(this.changed,t)},changedAttributes:function(t){if(!t)return this.hasChanged()?h.clone(this.changed):false;var e,i=false;var r=this._changing?this._previousAttributes:this.attributes;for(var s in t){if(h.isEqual(r[s],e=t[s]))continue;(i||(i={}))[s]=e}return i},previous:function(t){if(t==null||!this._previousAttributes)return null;return this._previousAttributes[t]},previousAttributes:function(){return h.clone(this._previousAttributes)},fetch:function(t){t=t?h.clone(t):{};if(t.parse===void 0)t.parse=true;var e=this;var i=t.success;t.success=function(r){if(!e.set(e.parse(r,t),t))return false;if(i)i(e,r,t);e.trigger("sync",e,r,t)};M(this,t);return this.sync("read",this,t)},save:function(t,e,i){var r,s,n,a=this.attributes;if(t==null||typeof t==="object"){r=t;i=e}else{(r={})[t]=e}i=h.extend({validate:true},i);if(r&&!i.wait){if(!this.set(r,i))return false}else{if(!this._validate(r,i))return false}if(r&&i.wait){this.attributes=h.extend({},a,r)}if(i.parse===void 0)i.parse=true;var o=this;var u=i.success;i.success=function(t){o.attributes=a;var e=o.parse(t,i);if(i.wait)e=h.extend(r||{},e);if(h.isObject(e)&&!o.set(e,i)){return false}if(u)u(o,t,i);o.trigger("sync",o,t,i)};M(this,i);s=this.isNew()?"create":i.patch?"patch":"update";if(s==="patch")i.attrs=r;n=this.sync(s,this,i);if(r&&i.wait)this.attributes=a;return n},destroy:function(t){t=t?h.clone(t):{};var e=this;var i=t.success;var r=function(){e.trigger("destroy",e,e.collection,t)};t.success=function(s){if(t.wait||e.isNew())r();if(i)i(e,s,t);if(!e.isNew())e.trigger("sync",e,s,t)};if(this.isNew()){t.success();return false}M(this,t);var s=this.sync("delete",this,t);if(!t.wait)r();return s},url:function(){var t=h.result(this,"urlRoot")||h.result(this.collection,"url")||U();if(this.isNew())return t;return t+(t.charAt(t.length-1)==="/"?"":"/")+encodeURIComponent(this.id)},parse:function(t,e){return t},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return this.id==null},isValid:function(t){return this._validate({},h.extend(t||{},{validate:true}))},_validate:function(t,e){if(!e.validate||!this.validate)return true;t=h.extend({},this.attributes,t);var i=this.validationError=this.validate(t,e)||null;if(!i)return true;this.trigger("invalid",this,i,h.extend(e,{validationError:i}));return false}});var p=["keys","values","pairs","invert","pick","omit"];h.each(p,function(t){d.prototype[t]=function(){var e=s.call(arguments);e.unshift(this.attributes);return h[t].apply(h,e)}});var v=a.Collection=function(t,e){e||(e={});if(e.model)this.model=e.model;if(e.comparator!==void 0)this.comparator=e.comparator;this._reset();this.initialize.apply(this,arguments);if(t)this.reset(t,h.extend({silent:true},e))};var g={add:true,remove:true,merge:true};var m={add:true,remove:false};h.extend(v.prototype,o,{model:d,initialize:function(){},toJSON:function(t){return this.map(function(e){return e.toJSON(t)})},sync:function(){return a.sync.apply(this,arguments)},add:function(t,e){return this.set(t,h.extend({merge:false},e,m))},remove:function(t,e){var i=!h.isArray(t);t=i?[t]:h.clone(t);e||(e={});var r,s,n,a;for(r=0,s=t.length;r<s;r++){a=t[r]=this.get(t[r]);if(!a)continue;delete this._byId[a.id];delete this._byId[a.cid];n=this.indexOf(a);this.models.splice(n,1);this.length--;if(!e.silent){e.index=n;a.trigger("remove",a,this,e)}this._removeReference(a)}return i?t[0]:t},set:function(t,e){e=h.defaults({},e,g);if(e.parse)t=this.parse(t,e);var i=!h.isArray(t);t=i?t?[t]:[]:h.clone(t);var r,s,n,a,o,u,l;var c=e.at;var f=this.model;var p=this.comparator&&c==null&&e.sort!==false;var v=h.isString(this.comparator)?this.comparator:null;var m=[],y=[],_={};var w=e.add,b=e.merge,x=e.remove;var E=!p&&w&&x?[]:false;for(r=0,s=t.length;r<s;r++){o=t[r];if(o instanceof d){n=a=o}else{n=o[f.prototype.idAttribute]}if(u=this.get(n)){if(x)_[u.cid]=true;if(b){o=o===a?a.attributes:o;if(e.parse)o=u.parse(o,e);u.set(o,e);if(p&&!l&&u.hasChanged(v))l=true}t[r]=u}else if(w){a=t[r]=this._prepareModel(o,e);if(!a)continue;m.push(a);a.on("all",this._onModelEvent,this);this._byId[a.cid]=a;if(a.id!=null)this._byId[a.id]=a}if(E)E.push(u||a)}if(x){for(r=0,s=this.length;r<s;++r){if(!_[(a=this.models[r]).cid])y.push(a)}if(y.length)this.remove(y,e)}if(m.length||E&&E.length){if(p)l=true;this.length+=m.length;if(c!=null){for(r=0,s=m.length;r<s;r++){this.models.splice(c+r,0,m[r])}}else{if(E)this.models.length=0;var T=E||m;for(r=0,s=T.length;r<s;r++){this.models.push(T[r])}}}if(l)this.sort({silent:true});if(!e.silent){for(r=0,s=m.length;r<s;r++){(a=m[r]).trigger("add",a,this,e)}if(l||E&&E.length)this.trigger("sort",this,e)}return i?t[0]:t},reset:function(t,e){e||(e={});for(var i=0,r=this.models.length;i<r;i++){this._removeReference(this.models[i])}e.previousModels=this.models;this._reset();t=this.add(t,h.extend({silent:true},e));if(!e.silent)this.trigger("reset",this,e);return t},push:function(t,e){return this.add(t,h.extend({at:this.length},e))},pop:function(t){var e=this.at(this.length-1);this.remove(e,t);return e},unshift:function(t,e){return this.add(t,h.extend({at:0},e))},shift:function(t){var e=this.at(0);this.remove(e,t);return e},slice:function(){return s.apply(this.models,arguments)},get:function(t){if(t==null)return void 0;return this._byId[t.id]||this._byId[t.cid]||this._byId[t]},at:function(t){return this.models[t]},where:function(t,e){if(h.isEmpty(t))return e?void 0:[];return this[e?"find":"filter"](function(e){for(var i in t){if(t[i]!==e.get(i))return false}return true})},findWhere:function(t){return this.where(t,true)},sort:function(t){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");t||(t={});if(h.isString(this.comparator)||this.comparator.length===1){this.models=this.sortBy(this.comparator,this)}else{this.models.sort(h.bind(this.comparator,this))}if(!t.silent)this.trigger("sort",this,t);return this},pluck:function(t){return h.invoke(this.models,"get",t)},fetch:function(t){t=t?h.clone(t):{};if(t.parse===void 0)t.parse=true;var e=t.success;var i=this;t.success=function(r){var s=t.reset?"reset":"set";i[s](r,t);if(e)e(i,r,t);i.trigger("sync",i,r,t)};M(this,t);return this.sync("read",this,t)},create:function(t,e){e=e?h.clone(e):{};if(!(t=this._prepareModel(t,e)))return false;if(!e.wait)this.add(t,e);var i=this;var r=e.success;e.success=function(t,e,s){if(s.wait)i.add(t,s);if(r)r(t,e,s)};t.save(null,e);return t},parse:function(t,e){return t},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0;this.models=[];this._byId={}},_prepareModel:function(t,e){if(t instanceof d){if(!t.collection)t.collection=this;return t}e=e?h.clone(e):{};e.collection=this;var i=new this.model(t,e);if(!i.validationError)return i;this.trigger("invalid",this,i.validationError,e);return false},_removeReference:function(t){if(this===t.collection)delete t.collection;t.off("all",this._onModelEvent,this)},_onModelEvent:function(t,e,i,r){if((t==="add"||t==="remove")&&i!==this)return;if(t==="destroy")this.remove(e,r);if(e&&t==="change:"+e.idAttribute){delete this._byId[e.previous(e.idAttribute)];if(e.id!=null)this._byId[e.id]=e}this.trigger.apply(this,arguments)}});var y=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain"];h.each(y,function(t){v.prototype[t]=function(){var e=s.call(arguments);e.unshift(this.models);return h[t].apply(h,e)}});var _=["groupBy","countBy","sortBy"];h.each(_,function(t){v.prototype[t]=function(e,i){var r=h.isFunction(e)?e:function(t){return t.get(e)};return h[t](this.models,r,i)}});var w=a.View=function(t){this.cid=h.uniqueId("view");t||(t={});h.extend(this,h.pick(t,x));this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()};var b=/^(\S+)\s*(.*)$/;var x=["model","collection","el","id","attributes","className","tagName","events"];h.extend(w.prototype,o,{tagName:"div",$:function(t){return this.$el.find(t)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();this.stopListening();return this},setElement:function(t,e){if(this.$el)this.undelegateEvents();this.$el=t instanceof a.$?t:a.$(t);this.el=this.$el[0];if(e!==false)this.delegateEvents();return this},delegateEvents:function(t){if(!(t||(t=h.result(this,"events"))))return this;this.undelegateEvents();for(var e in t){var i=t[e];if(!h.isFunction(i))i=this[t[e]];if(!i)continue;var r=e.match(b);var s=r[1],n=r[2];i=h.bind(i,this);s+=".delegateEvents"+this.cid;if(n===""){this.$el.on(s,i)}else{this.$el.on(s,n,i)}}return this},undelegateEvents:function(){this.$el.off(".delegateEvents"+this.cid);return this},_ensureElement:function(){if(!this.el){var t=h.extend({},h.result(this,"attributes"));if(this.id)t.id=h.result(this,"id");if(this.className)t["class"]=h.result(this,"className");var e=a.$("<"+h.result(this,"tagName")+">").attr(t);this.setElement(e,false)}else{this.setElement(h.result(this,"el"),false)}}});a.sync=function(t,e,i){var r=T[t];h.defaults(i||(i={}),{emulateHTTP:a.emulateHTTP,emulateJSON:a.emulateJSON});var s={type:r,dataType:"json"};if(!i.url){s.url=h.result(e,"url")||U()}if(i.data==null&&e&&(t==="create"||t==="update"||t==="patch")){s.contentType="application/json";s.data=JSON.stringify(i.attrs||e.toJSON(i))}if(i.emulateJSON){s.contentType="application/x-www-form-urlencoded";s.data=s.data?{model:s.data}:{}}if(i.emulateHTTP&&(r==="PUT"||r==="DELETE"||r==="PATCH")){s.type="POST";if(i.emulateJSON)s.data._method=r;var n=i.beforeSend;i.beforeSend=function(t){t.setRequestHeader("X-HTTP-Method-Override",r);if(n)return n.apply(this,arguments)}}if(s.type!=="GET"&&!i.emulateJSON){s.processData=false}if(s.type==="PATCH"&&E){s.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")}}var o=i.xhr=a.ajax(h.extend(s,i));e.trigger("request",e,o,i);return o};var E=typeof window!=="undefined"&&!!window.ActiveXObject&&!(window.XMLHttpRequest&&(new XMLHttpRequest).dispatchEvent);var T={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};a.ajax=function(){return a.$.ajax.apply(a.$,arguments)};var k=a.Router=function(t){t||(t={});if(t.routes)this.routes=t.routes;this._bindRoutes();this.initialize.apply(this,arguments)};var S=/\((.*?)\)/g;var $=/(\(\?)?:\w+/g;var H=/\*\w+/g;var A=/[\-{}\[\]+?.,\\\^$|#\s]/g;h.extend(k.prototype,o,{initialize:function(){},route:function(t,e,i){if(!h.isRegExp(t))t=this._routeToRegExp(t);if(h.isFunction(e)){i=e;e=""}if(!i)i=this[e];var r=this;a.history.route(t,function(s){var n=r._extractParameters(t,s);i&&i.apply(r,n);r.trigger.apply(r,["route:"+e].concat(n));r.trigger("route",e,n);a.history.trigger("route",r,e,n)});return this},navigate:function(t,e){a.history.navigate(t,e);return this},_bindRoutes:function(){if(!this.routes)return;this.routes=h.result(this,"routes");var t,e=h.keys(this.routes);while((t=e.pop())!=null){this.route(t,this.routes[t])}},_routeToRegExp:function(t){t=t.replace(A,"\\$&").replace(S,"(?:$1)?").replace($,function(t,e){return e?t:"([^/]+)"}).replace(H,"(.*?)");return new RegExp("^"+t+"$")},_extractParameters:function(t,e){var i=t.exec(e).slice(1);return h.map(i,function(t){return t?decodeURIComponent(t):null})}});var I=a.History=function(){this.handlers=[];h.bindAll(this,"checkUrl");if(typeof window!=="undefined"){this.location=window.location;this.history=window.history}};var N=/^[#\/]|\s+$/g;var O=/^\/+|\/+$/g;var P=/msie [\w.]+/;var C=/\/$/;var j=/[?#].*$/;I.started=false;h.extend(I.prototype,o,{interval:50,getHash:function(t){var e=(t||this).location.href.match(/#(.*)$/);return e?e[1]:""},getFragment:function(t,e){if(t==null){if(this._hasPushState||!this._wantsHashChange||e){t=this.location.pathname;var i=this.root.replace(C,"");if(!t.indexOf(i))t=t.slice(i.length)}else{t=this.getHash()}}return t.replace(N,"")},start:function(t){if(I.started)throw new Error("Backbone.history has already been started");I.started=true;this.options=h.extend({root:"/"},this.options,t);this.root=this.options.root;this._wantsHashChange=this.options.hashChange!==false;this._wantsPushState=!!this.options.pushState;this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var e=this.getFragment();var i=document.documentMode;var r=P.exec(navigator.userAgent.toLowerCase())&&(!i||i<=7);this.root=("/"+this.root+"/").replace(O,"/");if(r&&this._wantsHashChange){this.iframe=a.$('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo("body")[0].contentWindow;this.navigate(e)}if(this._hasPushState){a.$(window).on("popstate",this.checkUrl)}else if(this._wantsHashChange&&"onhashchange"in window&&!r){a.$(window).on("hashchange",this.checkUrl)}else if(this._wantsHashChange){this._checkUrlInterval=setInterval(this.checkUrl,this.interval)}this.fragment=e;var s=this.location;var n=s.pathname.replace(/[^\/]$/,"$&/")===this.root;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!n){this.fragment=this.getFragment(null,true);this.location.replace(this.root+this.location.search+"#"+this.fragment);return true}else if(this._hasPushState&&n&&s.hash){this.fragment=this.getHash().replace(N,"");this.history.replaceState({},document.title,this.root+this.fragment+s.search)}}if(!this.options.silent)return this.loadUrl()},stop:function(){a.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);I.started=false},route:function(t,e){this.handlers.unshift({route:t,callback:e})},checkUrl:function(t){var e=this.getFragment();if(e===this.fragment&&this.iframe){e=this.getFragment(this.getHash(this.iframe))}if(e===this.fragment)return false;if(this.iframe)this.navigate(e);this.loadUrl()},loadUrl:function(t){t=this.fragment=this.getFragment(t);return h.any(this.handlers,function(e){if(e.route.test(t)){e.callback(t);return true}})},navigate:function(t,e){if(!I.started)return false;if(!e||e===true)e={trigger:!!e};var i=this.root+(t=this.getFragment(t||""));t=t.replace(j,"");if(this.fragment===t)return;this.fragment=t;if(t===""&&i!=="/")i=i.slice(0,-1);if(this._hasPushState){this.history[e.replace?"replaceState":"pushState"]({},document.title,i)}else if(this._wantsHashChange){this._updateHash(this.location,t,e.replace);if(this.iframe&&t!==this.getFragment(this.getHash(this.iframe))){if(!e.replace)this.iframe.document.open().close();this._updateHash(this.iframe.location,t,e.replace)}}else{return this.location.assign(i)}if(e.trigger)return this.loadUrl(t)},_updateHash:function(t,e,i){if(i){var r=t.href.replace(/(javascript:|#).*$/,"");t.replace(r+"#"+e)}else{t.hash="#"+e}}});a.history=new I;var R=function(t,e){var i=this;var r;if(t&&h.has(t,"constructor")){r=t.constructor}else{r=function(){return i.apply(this,arguments)}}h.extend(r,i,e);var s=function(){this.constructor=r};s.prototype=i.prototype;r.prototype=new s;if(t)h.extend(r.prototype,t);r.__super__=i.prototype;return r};d.extend=v.extend=k.extend=w.extend=I.extend=R;var U=function(){throw new Error('A "url" property or function must be specified')};var M=function(t,e){var i=e.error;e.error=function(r){if(i)i(t,r,e);t.trigger("error",t,r,e)}}}).call(this);
+//# sourceMappingURL=backbone-min.map
\ No newline at end of file
diff --git a/bower_components/backbone/backbone-min.map b/bower_components/backbone/backbone-min.map
index 5d6ad350..b346c290 100644
--- a/bower_components/backbone/backbone-min.map
+++ b/bower_components/backbone/backbone-min.map
@@ -1 +1 @@
-{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["root","this","previousBackbone","Backbone","array","push","slice","splice","exports","VERSION","_","require","$","jQuery","Zepto","ender","noConflict","emulateHTTP","emulateJSON","Events","on","name","callback","context","eventsApi","_events","events","ctx","once","self","off","apply","arguments","_callback","retain","ev","names","i","l","j","k","keys","length","trigger","args","call","allEvents","all","triggerEvents","stopListening","obj","listeners","_listeners","deleteListener","_listenerId","id","eventSplitter","action","rest","key","concat","test","split","a1","a2","a3","listenMethods","listenTo","listenToOnce","each","implementation","method","uniqueId","bind","unbind","extend","Model","attributes","options","defaults","attrs","cid","pick","modelOptions","parse","result","set","changed","initialize","prototype","validationError","idAttribute","toJSON","clone","sync","get","attr","escape","has","val","unset","changes","silent","changing","prev","current","_validate","_changing","_previousAttributes","isEqual","_pending","clear","hasChanged","isEmpty","changedAttributes","diff","old","previous","previousAttributes","fetch","model","success","resp","wrapError","save","xhr","wait","validate","serverAttrs","isObject","isNew","patch","destroy","collection","url","base","urlError","charAt","encodeURIComponent","constructor","isValid","error","modelMethods","unshift","Collection","models","comparator","_reset","reset","setOptions","add","remove","merge","addOptions","map","isArray","index","_byId","indexOf","_removeReference","existing","sort","at","sortable","sortAttr","isString","toAdd","toRemove","modelMap","_prepareModel","_onModelEvent","previousModels","pop","shift","begin","end","where","first","findWhere","Error","sortBy","sortedIndex","value","iterator","isFunction","pluck","invoke","create","event","methods","attributeMethods","View","_configure","_ensureElement","delegateEvents","delegateEventSplitter","viewOptions","tagName","selector","$el","find","render","setElement","element","delegate","undelegateEvents","el","match","eventName","className","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","window","ActiveXObject","external","msActiveXFilteringEnabled","ajax","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","navigate","replace","optional","RegExp","exec","param","decodeURIComponent","History","handlers","bindAll","location","routeStripper","rootStripper","isExplorer","trailingSlash","started","interval","getHash","href","getFragment","forcePushState","_hasPushState","_wantsHashChange","pathname","substr","start","hashChange","_wantsPushState","pushState","docMode","document","documentMode","oldIE","navigator","userAgent","toLowerCase","iframe","hide","appendTo","contentWindow","checkUrl","_checkUrlInterval","setInterval","loc","atRoot","search","hash","replaceState","title","loadUrl","stop","clearInterval","e","fragmentOverride","matched","any","handler","_updateHash","open","close","assign","protoProps","staticProps","parent","child","Surrogate","__super__"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"backbone-min.js","sources":["backbone.js"],"names":["root","this","previousBackbone","Backbone","array","push","slice","splice","exports","VERSION","_","require","$","jQuery","Zepto","ender","noConflict","emulateHTTP","emulateJSON","Events","on","name","callback","context","eventsApi","_events","events","ctx","once","self","off","apply","arguments","_callback","retain","ev","names","i","l","j","k","keys","length","trigger","args","call","allEvents","all","triggerEvents","stopListening","obj","listeningTo","_listeningTo","remove","_listenId","id","isEmpty","eventSplitter","action","rest","key","concat","test","split","a1","a2","a3","listenMethods","listenTo","listenToOnce","each","implementation","method","uniqueId","bind","unbind","extend","Model","attributes","options","attrs","cid","collection","parse","defaults","result","set","changed","initialize","prototype","validationError","idAttribute","toJSON","clone","sync","get","attr","escape","has","val","unset","changes","silent","changing","prev","current","_validate","_changing","_previousAttributes","isEqual","_pending","clear","hasChanged","changedAttributes","diff","old","previous","previousAttributes","fetch","model","success","resp","wrapError","save","xhr","validate","wait","serverAttrs","isObject","isNew","patch","destroy","url","base","urlError","charAt","encodeURIComponent","constructor","isValid","error","modelMethods","unshift","Collection","models","comparator","_reset","reset","setOptions","add","merge","addOptions","map","singular","isArray","index","_byId","indexOf","_removeReference","existing","sort","at","targetModel","sortable","sortAttr","isString","toAdd","toRemove","modelMap","order","_prepareModel","_onModelEvent","orderedModels","previousModels","pop","shift","where","first","findWhere","Error","sortBy","pluck","invoke","create","event","methods","attributeMethods","value","iterator","isFunction","View","pick","viewOptions","_ensureElement","delegateEvents","delegateEventSplitter","tagName","selector","$el","find","render","setElement","element","delegate","undelegateEvents","el","match","eventName","className","type","methodMap","params","dataType","data","contentType","JSON","stringify","_method","beforeSend","setRequestHeader","processData","noXhrPatch","ActiveXObject","ajax","window","XMLHttpRequest","dispatchEvent","update","delete","read","Router","routes","_bindRoutes","optionalParam","namedParam","splatParam","escapeRegExp","route","isRegExp","_routeToRegExp","router","history","fragment","_extractParameters","navigate","replace","optional","RegExp","exec","param","decodeURIComponent","History","handlers","bindAll","location","routeStripper","rootStripper","isExplorer","trailingSlash","pathStripper","started","interval","getHash","href","getFragment","forcePushState","_hasPushState","_wantsHashChange","pathname","start","hashChange","_wantsPushState","pushState","docMode","document","documentMode","oldIE","navigator","userAgent","toLowerCase","iframe","hide","appendTo","contentWindow","checkUrl","_checkUrlInterval","setInterval","loc","atRoot","search","hash","replaceState","title","loadUrl","stop","clearInterval","e","any","handler","_updateHash","open","close","assign","protoProps","staticProps","parent","child","Surrogate","__super__"],"mappings":"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"}
\ No newline at end of file
diff --git a/bower_components/backbone/backbone.js b/bower_components/backbone/backbone.js
index 3512d42f..f7783c2c 100644
--- a/bower_components/backbone/backbone.js
+++ b/bower_components/backbone/backbone.js
@@ -1,6 +1,7 @@
-//     Backbone.js 1.0.0
+//     Backbone.js 1.1.0
 
-//     (c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2010-2011 Jeremy Ashkenas, DocumentCloud Inc.
+//     (c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Backbone may be freely distributed under the MIT license.
 //     For all details and documentation:
 //     http://backbonejs.org
@@ -34,7 +35,7 @@
   }
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '1.0.0';
+  Backbone.VERSION = '1.1.0';
 
   // Require Underscore, if we're on the server, and it's not already present.
   var _ = root._;
@@ -52,7 +53,7 @@
   };
 
   // Turn on `emulateHTTP` to support legacy HTTP servers. Setting this option
-  // will fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and
+  // will fake `"PATCH"`, `"PUT"` and `"DELETE"` requests via the `_method` parameter and
   // set a `X-Http-Method-Override` header.
   Backbone.emulateHTTP = false;
 
@@ -111,7 +112,6 @@
         this._events = {};
         return this;
       }
-
       names = name ? [name] : _.keys(this._events);
       for (i = 0, l = names.length; i < l; i++) {
         name = names[i];
@@ -151,14 +151,15 @@
     // Tell this object to stop listening to either specific events ... or
     // to every object it's currently listening to.
     stopListening: function(obj, name, callback) {
-      var listeners = this._listeners;
-      if (!listeners) return this;
-      var deleteListener = !name && !callback;
-      if (typeof name === 'object') callback = this;
-      if (obj) (listeners = {})[obj._listenerId] = obj;
-      for (var id in listeners) {
-        listeners[id].off(name, callback, this);
-        if (deleteListener) delete this._listeners[id];
+      var listeningTo = this._listeningTo;
+      if (!listeningTo) return this;
+      var remove = !name && !callback;
+      if (!callback && typeof name === 'object') callback = this;
+      if (obj) (listeningTo = {})[obj._listenId] = obj;
+      for (var id in listeningTo) {
+        obj = listeningTo[id];
+        obj.off(name, callback, this);
+        if (remove || _.isEmpty(obj._events)) delete this._listeningTo[id];
       }
       return this;
     }
@@ -215,10 +216,10 @@
   // listening to.
   _.each(listenMethods, function(implementation, method) {
     Events[method] = function(obj, name, callback) {
-      var listeners = this._listeners || (this._listeners = {});
-      var id = obj._listenerId || (obj._listenerId = _.uniqueId('l'));
-      listeners[id] = obj;
-      if (typeof name === 'object') callback = this;
+      var listeningTo = this._listeningTo || (this._listeningTo = {});
+      var id = obj._listenId || (obj._listenId = _.uniqueId('l'));
+      listeningTo[id] = obj;
+      if (!callback && typeof name === 'object') callback = this;
       obj[implementation](name, callback, this);
       return this;
     };
@@ -243,24 +244,18 @@
   // Create a new model with the specified attributes. A client id (`cid`)
   // is automatically generated and assigned for you.
   var Model = Backbone.Model = function(attributes, options) {
-    var defaults;
     var attrs = attributes || {};
     options || (options = {});
     this.cid = _.uniqueId('c');
     this.attributes = {};
-    _.extend(this, _.pick(options, modelOptions));
+    if (options.collection) this.collection = options.collection;
     if (options.parse) attrs = this.parse(attrs, options) || {};
-    if (defaults = _.result(this, 'defaults')) {
-      attrs = _.defaults({}, attrs, defaults);
-    }
+    attrs = _.defaults({}, attrs, _.result(this, 'defaults'));
     this.set(attrs, options);
     this.changed = {};
     this.initialize.apply(this, arguments);
   };
 
-  // A list of options to be attached directly to the model, if provided.
-  var modelOptions = ['url', 'urlRoot', 'collection'];
-
   // Attach all inheritable methods to the Model prototype.
   _.extend(Model.prototype, Events, {
 
@@ -456,13 +451,16 @@
         (attrs = {})[key] = val;
       }
 
-      // If we're not waiting and attributes exist, save acts as `set(attr).save(null, opts)`.
-      if (attrs && (!options || !options.wait) && !this.set(attrs, options)) return false;
-
       options = _.extend({validate: true}, options);
 
-      // Do not persist invalid models.
-      if (!this._validate(attrs, options)) return false;
+      // If we're not waiting and attributes exist, save acts as
+      // `set(attr).save(null, opts)` with validation. Otherwise, check if
+      // the model will be valid when the attributes, if any, are set.
+      if (attrs && !options.wait) {
+        if (!this.set(attrs, options)) return false;
+      } else {
+        if (!this._validate(attrs, options)) return false;
+      }
 
       // Set temporary attributes if `{wait: true}`.
       if (attrs && options.wait) {
@@ -563,7 +561,7 @@
       attrs = _.extend({}, this.attributes, attrs);
       var error = this.validationError = this.validate(attrs, options) || null;
       if (!error) return true;
-      this.trigger('invalid', this, error, _.extend(options || {}, {validationError: error}));
+      this.trigger('invalid', this, error, _.extend(options, {validationError: error}));
       return false;
     }
 
@@ -596,7 +594,6 @@
   // its models in sort order, as they're added and removed.
   var Collection = Backbone.Collection = function(models, options) {
     options || (options = {});
-    if (options.url) this.url = options.url;
     if (options.model) this.model = options.model;
     if (options.comparator !== void 0) this.comparator = options.comparator;
     this._reset();
@@ -606,7 +603,7 @@
 
   // Default options for `Collection#set`.
   var setOptions = {add: true, remove: true, merge: true};
-  var addOptions = {add: true, merge: false, remove: false};
+  var addOptions = {add: true, remove: false};
 
   // Define the Collection's inheritable methods.
   _.extend(Collection.prototype, Events, {
@@ -632,16 +629,17 @@
 
     // Add a model, or list of models to the set.
     add: function(models, options) {
-      return this.set(models, _.defaults(options || {}, addOptions));
+      return this.set(models, _.extend({merge: false}, options, addOptions));
     },
 
     // Remove a model, or a list of models from the set.
     remove: function(models, options) {
-      models = _.isArray(models) ? models.slice() : [models];
+      var singular = !_.isArray(models);
+      models = singular ? [models] : _.clone(models);
       options || (options = {});
       var i, l, index, model;
       for (i = 0, l = models.length; i < l; i++) {
-        model = this.get(models[i]);
+        model = models[i] = this.get(models[i]);
         if (!model) continue;
         delete this._byId[model.id];
         delete this._byId[model.cid];
@@ -654,7 +652,7 @@
         }
         this._removeReference(model);
       }
-      return this;
+      return singular ? models[0] : models;
     },
 
     // Update a collection by `set`-ing a new list of models, adding new ones,
@@ -662,31 +660,45 @@
     // already exist in the collection, as necessary. Similar to **Model#set**,
     // the core operation for updating the data contained by the collection.
     set: function(models, options) {
-      options = _.defaults(options || {}, setOptions);
+      options = _.defaults({}, options, setOptions);
       if (options.parse) models = this.parse(models, options);
-      if (!_.isArray(models)) models = models ? [models] : [];
-      var i, l, model, attrs, existing, sort;
+      var singular = !_.isArray(models);
+      models = singular ? (models ? [models] : []) : _.clone(models);
+      var i, l, id, model, attrs, existing, sort;
       var at = options.at;
+      var targetModel = this.model;
       var sortable = this.comparator && (at == null) && options.sort !== false;
       var sortAttr = _.isString(this.comparator) ? this.comparator : null;
       var toAdd = [], toRemove = [], modelMap = {};
+      var add = options.add, merge = options.merge, remove = options.remove;
+      var order = !sortable && add && remove ? [] : false;
 
       // Turn bare objects into model references, and prevent invalid models
       // from being added.
       for (i = 0, l = models.length; i < l; i++) {
-        if (!(model = this._prepareModel(models[i], options))) continue;
+        attrs = models[i];
+        if (attrs instanceof Model) {
+          id = model = attrs;
+        } else {
+          id = attrs[targetModel.prototype.idAttribute];
+        }
 
         // If a duplicate is found, prevent it from being added and
         // optionally merge it into the existing model.
-        if (existing = this.get(model)) {
-          if (options.remove) modelMap[existing.cid] = true;
-          if (options.merge) {
-            existing.set(model.attributes, options);
+        if (existing = this.get(id)) {
+          if (remove) modelMap[existing.cid] = true;
+          if (merge) {
+            attrs = attrs === model ? model.attributes : attrs;
+            if (options.parse) attrs = existing.parse(attrs, options);
+            existing.set(attrs, options);
             if (sortable && !sort && existing.hasChanged(sortAttr)) sort = true;
           }
+          models[i] = existing;
 
-        // This is a new model, push it to the `toAdd` list.
-        } else if (options.add) {
+        // If this is a new, valid model, push it to the `toAdd` list.
+        } else if (add) {
+          model = models[i] = this._prepareModel(attrs, options);
+          if (!model) continue;
           toAdd.push(model);
 
           // Listen to added models' events, and index models for lookup by
@@ -695,10 +707,11 @@
           this._byId[model.cid] = model;
           if (model.id != null) this._byId[model.id] = model;
         }
+        if (order) order.push(existing || model);
       }
 
       // Remove nonexistent models if appropriate.
-      if (options.remove) {
+      if (remove) {
         for (i = 0, l = this.length; i < l; ++i) {
           if (!modelMap[(model = this.models[i]).cid]) toRemove.push(model);
         }
@@ -706,29 +719,35 @@
       }
 
       // See if sorting is needed, update `length` and splice in new models.
-      if (toAdd.length) {
+      if (toAdd.length || (order && order.length)) {
         if (sortable) sort = true;
         this.length += toAdd.length;
         if (at != null) {
-          splice.apply(this.models, [at, 0].concat(toAdd));
+          for (i = 0, l = toAdd.length; i < l; i++) {
+            this.models.splice(at + i, 0, toAdd[i]);
+          }
         } else {
-          push.apply(this.models, toAdd);
+          if (order) this.models.length = 0;
+          var orderedModels = order || toAdd;
+          for (i = 0, l = orderedModels.length; i < l; i++) {
+            this.models.push(orderedModels[i]);
+          }
         }
       }
 
       // Silently sort the collection if appropriate.
       if (sort) this.sort({silent: true});
 
-      if (options.silent) return this;
-
-      // Trigger `add` events.
-      for (i = 0, l = toAdd.length; i < l; i++) {
-        (model = toAdd[i]).trigger('add', model, this, options);
+      // Unless silenced, it's time to fire all appropriate add/sort events.
+      if (!options.silent) {
+        for (i = 0, l = toAdd.length; i < l; i++) {
+          (model = toAdd[i]).trigger('add', model, this, options);
+        }
+        if (sort || (order && order.length)) this.trigger('sort', this, options);
       }
-
-      // Trigger `sort` if the collection was sorted.
-      if (sort) this.trigger('sort', this, options);
-      return this;
+      
+      // Return the added (or merged) model (or models).
+      return singular ? models[0] : models;
     },
 
     // When you have more items than you want to add or remove individually,
@@ -742,16 +761,14 @@
       }
       options.previousModels = this.models;
       this._reset();
-      this.add(models, _.extend({silent: true}, options));
+      models = this.add(models, _.extend({silent: true}, options));
       if (!options.silent) this.trigger('reset', this, options);
-      return this;
+      return models;
     },
 
     // Add a model to the end of the collection.
     push: function(model, options) {
-      model = this._prepareModel(model, options);
-      this.add(model, _.extend({at: this.length}, options));
-      return model;
+      return this.add(model, _.extend({at: this.length}, options));
     },
 
     // Remove a model from the end of the collection.
@@ -763,9 +780,7 @@
 
     // Add a model to the beginning of the collection.
     unshift: function(model, options) {
-      model = this._prepareModel(model, options);
-      this.add(model, _.extend({at: 0}, options));
-      return model;
+      return this.add(model, _.extend({at: 0}, options));
     },
 
     // Remove a model from the beginning of the collection.
@@ -776,14 +791,14 @@
     },
 
     // Slice out a sub-array of models from the collection.
-    slice: function(begin, end) {
-      return this.models.slice(begin, end);
+    slice: function() {
+      return slice.apply(this.models, arguments);
     },
 
     // Get a model from the set by id.
     get: function(obj) {
       if (obj == null) return void 0;
-      return this._byId[obj.id != null ? obj.id : obj.cid || obj];
+      return this._byId[obj.id] || this._byId[obj.cid] || this._byId[obj];
     },
 
     // Get the model at the given index.
@@ -827,16 +842,6 @@
       return this;
     },
 
-    // Figure out the smallest index at which a model should be inserted so as
-    // to maintain order.
-    sortedIndex: function(model, value, context) {
-      value || (value = this.comparator);
-      var iterator = _.isFunction(value) ? value : function(model) {
-        return model.get(value);
-      };
-      return _.sortedIndex(this.models, model, iterator, context);
-    },
-
     // Pluck an attribute from each model in the collection.
     pluck: function(attr) {
       return _.invoke(this.models, 'get', attr);
@@ -869,7 +874,7 @@
       if (!options.wait) this.add(model, options);
       var collection = this;
       var success = options.success;
-      options.success = function(resp) {
+      options.success = function(model, resp, options) {
         if (options.wait) collection.add(model, options);
         if (success) success(model, resp, options);
       };
@@ -903,14 +908,12 @@
         if (!attrs.collection) attrs.collection = this;
         return attrs;
       }
-      options || (options = {});
+      options = options ? _.clone(options) : {};
       options.collection = this;
       var model = new this.model(attrs, options);
-      if (!model._validate(attrs, options)) {
-        this.trigger('invalid', this, attrs, options);
-        return false;
-      }
-      return model;
+      if (!model.validationError) return model;
+      this.trigger('invalid', this, model.validationError, options);
+      return false;
     },
 
     // Internal method to sever a model's ties to a collection.
@@ -942,8 +945,8 @@
     'inject', 'reduceRight', 'foldr', 'find', 'detect', 'filter', 'select',
     'reject', 'every', 'all', 'some', 'any', 'include', 'contains', 'invoke',
     'max', 'min', 'toArray', 'size', 'first', 'head', 'take', 'initial', 'rest',
-    'tail', 'drop', 'last', 'without', 'indexOf', 'shuffle', 'lastIndexOf',
-    'isEmpty', 'chain'];
+    'tail', 'drop', 'last', 'without', 'difference', 'indexOf', 'shuffle',
+    'lastIndexOf', 'isEmpty', 'chain'];
 
   // Mix in each Underscore method as a proxy to `Collection#models`.
   _.each(methods, function(method) {
@@ -982,7 +985,8 @@
   // if an existing element is not provided...
   var View = Backbone.View = function(options) {
     this.cid = _.uniqueId('view');
-    this._configure(options || {});
+    options || (options = {});
+    _.extend(this, _.pick(options, viewOptions));
     this._ensureElement();
     this.initialize.apply(this, arguments);
     this.delegateEvents();
@@ -1001,7 +1005,7 @@
     tagName: 'div',
 
     // jQuery delegate for element lookup, scoped to DOM elements within the
-    // current view. This should be prefered to global lookups where possible.
+    // current view. This should be preferred to global lookups where possible.
     $: function(selector) {
       return this.$el.find(selector);
     },
@@ -1041,7 +1045,7 @@
     //
     //     {
     //       'mousedown .title':  'edit',
-    //       'click .button':     'save'
+    //       'click .button':     'save',
     //       'click .open':       function(e) { ... }
     //     }
     //
@@ -1079,16 +1083,6 @@
       return this;
     },
 
-    // Performs the initial configuration of a View with a set of options.
-    // Keys with special meaning *(e.g. model, collection, id, className)* are
-    // attached directly to the view.  See `viewOptions` for an exhaustive
-    // list.
-    _configure: function(options) {
-      if (this.options) options = _.extend({}, _.result(this, 'options'), options);
-      _.extend(this, _.pick(options, viewOptions));
-      this.options = options;
-    },
-
     // Ensure that the View has a DOM element to render into.
     // If `this.el` is a string, pass it through `$()`, take the first
     // matching element, and re-assign it to `el`. Otherwise, create
@@ -1174,8 +1168,7 @@
     // If we're sending a `PATCH` request, and we're in an old Internet Explorer
     // that still has ActiveX enabled by default, override jQuery to use that
     // for XHR instead. Remove this line when jQuery supports `PATCH` on IE8.
-    if (params.type === 'PATCH' && window.ActiveXObject &&
-          !(window.external && window.external.msActiveXFilteringEnabled)) {
+    if (params.type === 'PATCH' && noXhrPatch) {
       params.xhr = function() {
         return new ActiveXObject("Microsoft.XMLHTTP");
       };
@@ -1187,6 +1180,8 @@
     return xhr;
   };
 
+  var noXhrPatch = typeof window !== 'undefined' && !!window.ActiveXObject && !(window.XMLHttpRequest && (new XMLHttpRequest).dispatchEvent);
+
   // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
   var methodMap = {
     'create': 'POST',
@@ -1275,7 +1270,7 @@
     _routeToRegExp: function(route) {
       route = route.replace(escapeRegExp, '\\$&')
                    .replace(optionalParam, '(?:$1)?')
-                   .replace(namedParam, function(match, optional){
+                   .replace(namedParam, function(match, optional) {
                      return optional ? match : '([^\/]+)';
                    })
                    .replace(splatParam, '(.*?)');
@@ -1325,6 +1320,9 @@
   // Cached regex for removing a trailing slash.
   var trailingSlash = /\/$/;
 
+  // Cached regex for stripping urls of hash and query.
+  var pathStripper = /[?#].*$/;
+
   // Has the history handling already been started?
   History.started = false;
 
@@ -1349,7 +1347,7 @@
         if (this._hasPushState || !this._wantsHashChange || forcePushState) {
           fragment = this.location.pathname;
           var root = this.root.replace(trailingSlash, '');
-          if (!fragment.indexOf(root)) fragment = fragment.substr(root.length);
+          if (!fragment.indexOf(root)) fragment = fragment.slice(root.length);
         } else {
           fragment = this.getHash();
         }
@@ -1365,7 +1363,7 @@
 
       // Figure out the initial configuration. Do we need an iframe?
       // Is pushState desired ... is it available?
-      this.options          = _.extend({}, {root: '/'}, this.options, options);
+      this.options          = _.extend({root: '/'}, this.options, options);
       this.root             = this.options.root;
       this._wantsHashChange = this.options.hashChange !== false;
       this._wantsPushState  = !!this.options.pushState;
@@ -1398,19 +1396,25 @@
       var loc = this.location;
       var atRoot = loc.pathname.replace(/[^\/]$/, '$&/') === this.root;
 
-      // If we've started off with a route from a `pushState`-enabled browser,
-      // but we're currently in a browser that doesn't support it...
-      if (this._wantsHashChange && this._wantsPushState && !this._hasPushState && !atRoot) {
-        this.fragment = this.getFragment(null, true);
-        this.location.replace(this.root + this.location.search + '#' + this.fragment);
-        // Return immediately as browser will do redirect to new url
-        return true;
+      // Transition from hashChange to pushState or vice versa if both are
+      // requested.
+      if (this._wantsHashChange && this._wantsPushState) {
+
+        // If we've started off with a route from a `pushState`-enabled
+        // browser, but we're currently in a browser that doesn't support it...
+        if (!this._hasPushState && !atRoot) {
+          this.fragment = this.getFragment(null, true);
+          this.location.replace(this.root + this.location.search + '#' + this.fragment);
+          // Return immediately as browser will do redirect to new url
+          return true;
+
+        // Or if we've started out with a hash-based route, but we're currently
+        // in a browser where it could be `pushState`-based instead...
+        } else if (this._hasPushState && atRoot && loc.hash) {
+          this.fragment = this.getHash().replace(routeStripper, '');
+          this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
+        }
 
-      // Or if we've started out with a hash-based route, but we're currently
-      // in a browser where it could be `pushState`-based instead...
-      } else if (this._wantsPushState && this._hasPushState && atRoot && loc.hash) {
-        this.fragment = this.getHash().replace(routeStripper, '');
-        this.history.replaceState({}, document.title, this.root + this.fragment + loc.search);
       }
 
       if (!this.options.silent) return this.loadUrl();
@@ -1439,21 +1443,20 @@
       }
       if (current === this.fragment) return false;
       if (this.iframe) this.navigate(current);
-      this.loadUrl() || this.loadUrl(this.getHash());
+      this.loadUrl();
     },
 
     // Attempt to load the current URL fragment. If a route succeeds with a
     // match, returns `true`. If no defined routes matches the fragment,
     // returns `false`.
-    loadUrl: function(fragmentOverride) {
-      var fragment = this.fragment = this.getFragment(fragmentOverride);
-      var matched = _.any(this.handlers, function(handler) {
+    loadUrl: function(fragment) {
+      fragment = this.fragment = this.getFragment(fragment);
+      return _.any(this.handlers, function(handler) {
         if (handler.route.test(fragment)) {
           handler.callback(fragment);
           return true;
         }
       });
-      return matched;
     },
 
     // Save a fragment into the hash history, or replace the URL state if the
@@ -1465,11 +1468,18 @@
     // you wish to modify the current URL without adding an entry to the history.
     navigate: function(fragment, options) {
       if (!History.started) return false;
-      if (!options || options === true) options = {trigger: options};
-      fragment = this.getFragment(fragment || '');
+      if (!options || options === true) options = {trigger: !!options};
+
+      var url = this.root + (fragment = this.getFragment(fragment || ''));
+
+      // Strip the fragment of the query and hash for matching.
+      fragment = fragment.replace(pathStripper, '');
+
       if (this.fragment === fragment) return;
       this.fragment = fragment;
-      var url = this.root + fragment;
+
+      // Don't include a trailing slash on the root.
+      if (fragment === '' && url !== '/') url = url.slice(0, -1);
 
       // If pushState is available, we use it to set the fragment as a real URL.
       if (this._hasPushState) {
@@ -1492,7 +1502,7 @@
       } else {
         return this.location.assign(url);
       }
-      if (options.trigger) this.loadUrl(fragment);
+      if (options.trigger) return this.loadUrl(fragment);
     },
 
     // Update the hash location, either replacing the current entry, or adding
@@ -1560,7 +1570,7 @@
   };
 
   // Wrap an optional error callback with a fallback error event.
-  var wrapError = function (model, options) {
+  var wrapError = function(model, options) {
     var error = options.error;
     options.error = function(resp) {
       if (error) error(model, resp, options);
diff --git a/bower_components/backbone/docs/backbone.html b/bower_components/backbone/docs/backbone.html
index 7c386485..b971c5d7 100644
--- a/bower_components/backbone/docs/backbone.html
+++ b/bower_components/backbone/docs/backbone.html
@@ -27,9 +27,10 @@ <h1>backbone.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-              <pre><code>Backbone.js 1.0.0
+              <pre><code>Backbone.js 1.1.0
 
-(c) 2010-2013 Jeremy Ashkenas, DocumentCloud Inc.
+(c) 2010-2011 Jeremy Ashkenas, DocumentCloud Inc.
+(c) 2011-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters &amp; Editors
 Backbone may be freely distributed under the MIT license.
 For all details and documentation:
 http://backbonejs.org</code></pre>
@@ -61,8 +62,7 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
               <p>Save a reference to the global object (<code>window</code> in the browser, <code>exports</code>
-on the server).
-</p>
+on the server).</p>
 
             </div>
             
@@ -78,8 +78,7 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
               <p>Save the previous value of the <code>Backbone</code> variable, so that it can be
-restored later on, if <code>noConflict</code> is used.
-</p>
+restored later on, if <code>noConflict</code> is used.</p>
 
             </div>
             
@@ -94,8 +93,7 @@ <h2>Initial Setup</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Create local references to array methods we&#39;ll want to use later.
-</p>
+              <p>Create local references to array methods we&#39;ll want to use later.</p>
 
             </div>
             
@@ -114,8 +112,7 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
               <p>The top-level namespace. All public Backbone classes and modules will
-be attached to this. Exported for both the browser and the server.
-</p>
+be attached to this. Exported for both the browser and the server.</p>
 
             </div>
             
@@ -135,12 +132,11 @@ <h2>Initial Setup</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
-              <p>Current version of the library. Keep in sync with <code>package.json</code>.
-</p>
+              <p>Current version of the library. Keep in sync with <code>package.json</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  Backbone.VERSION = <span class="string">'1.0.0'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  Backbone.VERSION = <span class="string">'1.1.0'</span>;</pre></div></div>
             
         </li>
         
@@ -151,8 +147,7 @@ <h2>Initial Setup</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Require Underscore, if we&#39;re on the server, and it&#39;s not already present.
-</p>
+              <p>Require Underscore, if we&#39;re on the server, and it&#39;s not already present.</p>
 
             </div>
             
@@ -169,8 +164,7 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
               <p>For Backbone&#39;s purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
-the <code>$</code> variable.
-</p>
+the <code>$</code> variable.</p>
 
             </div>
             
@@ -186,8 +180,7 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
               <p>Runs Backbone.js in <em>noConflict</em> mode, returning the <code>Backbone</code> variable
-to its previous owner. Returns a reference to this Backbone object.
-</p>
+to its previous owner. Returns a reference to this Backbone object.</p>
 
             </div>
             
@@ -206,9 +199,8 @@ <h2>Initial Setup</h2>
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
               <p>Turn on <code>emulateHTTP</code> to support legacy HTTP servers. Setting this option
-will fake <code>&quot;PUT&quot;</code> and <code>&quot;DELETE&quot;</code> requests via the <code>_method</code> parameter and
-set a <code>X-Http-Method-Override</code> header.
-</p>
+will fake <code>&quot;PATCH&quot;</code>, <code>&quot;PUT&quot;</code> and <code>&quot;DELETE&quot;</code> requests via the <code>_method</code> parameter and
+set a <code>X-Http-Method-Override</code> header.</p>
 
             </div>
             
@@ -226,8 +218,7 @@ <h2>Initial Setup</h2>
               <p>Turn on <code>emulateJSON</code> to support legacy servers that can&#39;t deal with direct
 <code>application/json</code> requests ... will encode the body as
 <code>application/x-www-form-urlencoded</code> instead and will send the model in a
-form param named <code>model</code>.
-</p>
+form param named <code>model</code>.</p>
 
             </div>
             
@@ -258,9 +249,7 @@ <h2>Backbone.Events</h2>
               <p>A module that can be mixed in to <em>any object</em> in order to provide it with
 custom events. You may bind with <code>on</code> or remove with <code>off</code> callback
 functions to an event; <code>trigger</code>-ing an event fires all callbacks in
-succession.
-
-</p>
+succession.</p>
 <pre><code>var object = {};
 _.extend(object, Backbone.Events);
 object.on(&#39;expand&#39;, function(){ alert(&#39;expanded&#39;); });
@@ -280,8 +269,7 @@ <h2>Backbone.Events</h2>
                 <a class="pilcrow" href="#section-15">&#182;</a>
               </div>
               <p>Bind an event to a <code>callback</code> function. Passing <code>&quot;all&quot;</code> will bind
-the callback to all events fired.
-</p>
+the callback to all events fired.</p>
 
             </div>
             
@@ -303,8 +291,7 @@ <h2>Backbone.Events</h2>
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
               <p>Bind an event to only be triggered a single time. After the first time
-the callback is invoked, it will be removed.
-</p>
+the callback is invoked, it will be removed.</p>
 
             </div>
             
@@ -331,8 +318,7 @@ <h2>Backbone.Events</h2>
               <p>Remove one or many callbacks. If <code>context</code> is null, removes all
 callbacks with that function. If <code>callback</code> is null, removes all
 callbacks for the event. If <code>name</code> is null, removes all bound
-callbacks for all events.
-</p>
+callbacks for all events.</p>
 
             </div>
             
@@ -343,7 +329,6 @@ <h2>Backbone.Events</h2>
         <span class="keyword">this</span>._events = {};
         <span class="keyword">return</span> <span class="keyword">this</span>;
       }
-
       names = name ? [name] : _.keys(<span class="keyword">this</span>._events);
       <span class="keyword">for</span> (i = <span class="number">0</span>, l = names.length; i &lt; l; i++) {
         name = names[i];
@@ -377,8 +362,7 @@ <h2>Backbone.Events</h2>
               <p>Trigger one or many events, firing all bound callbacks. Callbacks are
 passed the same arguments as <code>trigger</code> is, apart from the event name
 (unless you&#39;re listening on <code>&quot;all&quot;</code>, which will cause your callback to
-receive the true name of the event as the first argument).
-</p>
+receive the true name of the event as the first argument).</p>
 
             </div>
             
@@ -403,20 +387,20 @@ <h2>Backbone.Events</h2>
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
               <p>Tell this object to stop listening to either specific events ... or
-to every object it&#39;s currently listening to.
-</p>
+to every object it&#39;s currently listening to.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    stopListening: <span class="keyword">function</span>(obj, name, callback) {
-      <span class="keyword">var</span> listeners = <span class="keyword">this</span>._listeners;
-      <span class="keyword">if</span> (!listeners) <span class="keyword">return</span> <span class="keyword">this</span>;
-      <span class="keyword">var</span> deleteListener = !name &amp;&amp; !callback;
-      <span class="keyword">if</span> (<span class="keyword">typeof</span> name === <span class="string">'object'</span>) callback = <span class="keyword">this</span>;
-      <span class="keyword">if</span> (obj) (listeners = {})[obj._listenerId] = obj;
-      <span class="keyword">for</span> (<span class="keyword">var</span> id <span class="keyword">in</span> listeners) {
-        listeners[id].off(name, callback, <span class="keyword">this</span>);
-        <span class="keyword">if</span> (deleteListener) <span class="keyword">delete</span> <span class="keyword">this</span>._listeners[id];
+      <span class="keyword">var</span> listeningTo = <span class="keyword">this</span>._listeningTo;
+      <span class="keyword">if</span> (!listeningTo) <span class="keyword">return</span> <span class="keyword">this</span>;
+      <span class="keyword">var</span> remove = !name &amp;&amp; !callback;
+      <span class="keyword">if</span> (!callback &amp;&amp; <span class="keyword">typeof</span> name === <span class="string">'object'</span>) callback = <span class="keyword">this</span>;
+      <span class="keyword">if</span> (obj) (listeningTo = {})[obj._listenId] = obj;
+      <span class="keyword">for</span> (<span class="keyword">var</span> id <span class="keyword">in</span> listeningTo) {
+        obj = listeningTo[id];
+        obj.off(name, callback, <span class="keyword">this</span>);
+        <span class="keyword">if</span> (remove || _.isEmpty(obj._events)) <span class="keyword">delete</span> <span class="keyword">this</span>._listeningTo[id];
       }
       <span class="keyword">return</span> <span class="keyword">this</span>;
     }
@@ -432,8 +416,7 @@ <h2>Backbone.Events</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-20">&#182;</a>
               </div>
-              <p>Regular expression used to split event strings.
-</p>
+              <p>Regular expression used to split event strings.</p>
 
             </div>
             
@@ -450,8 +433,7 @@ <h2>Backbone.Events</h2>
               </div>
               <p>Implement fancy features of the Events API such as multiple event
 names <code>&quot;change blur&quot;</code> and jQuery-style event maps <code>{change: action}</code>
-in terms of the existing API.
-</p>
+in terms of the existing API.</p>
 
             </div>
             
@@ -467,8 +449,7 @@ <h2>Backbone.Events</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
-              <p>Handle event maps.
-</p>
+              <p>Handle event maps.</p>
 
             </div>
             
@@ -488,8 +469,7 @@ <h2>Backbone.Events</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
-              <p>Handle space separated event names.
-</p>
+              <p>Handle space separated event names.</p>
 
             </div>
             
@@ -515,8 +495,7 @@ <h2>Backbone.Events</h2>
               </div>
               <p>A difficult-to-believe, but optimized internal dispatch function for
 triggering events. Tries to keep the usual cases speedy (most internal
-Backbone events have 3 arguments).
-</p>
+Backbone events have 3 arguments).</p>
 
             </div>
             
@@ -544,17 +523,16 @@ <h2>Backbone.Events</h2>
               </div>
               <p>Inversion-of-control versions of <code>on</code> and <code>once</code>. Tell <em>this</em> object to
 listen to an event in another object ... keeping track of what it&#39;s
-listening to.
-</p>
+listening to.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  _.each(listenMethods, <span class="keyword">function</span>(implementation, method) {
     Events[method] = <span class="keyword">function</span>(obj, name, callback) {
-      <span class="keyword">var</span> listeners = <span class="keyword">this</span>._listeners || (<span class="keyword">this</span>._listeners = {});
-      <span class="keyword">var</span> id = obj._listenerId || (obj._listenerId = _.uniqueId(<span class="string">'l'</span>));
-      listeners[id] = obj;
-      <span class="keyword">if</span> (<span class="keyword">typeof</span> name === <span class="string">'object'</span>) callback = <span class="keyword">this</span>;
+      <span class="keyword">var</span> listeningTo = <span class="keyword">this</span>._listeningTo || (<span class="keyword">this</span>._listeningTo = {});
+      <span class="keyword">var</span> id = obj._listenId || (obj._listenId = _.uniqueId(<span class="string">'l'</span>));
+      listeningTo[id] = obj;
+      <span class="keyword">if</span> (!callback &amp;&amp; <span class="keyword">typeof</span> name === <span class="string">'object'</span>) callback = <span class="keyword">this</span>;
       obj[implementation](name, callback, <span class="keyword">this</span>);
       <span class="keyword">return</span> <span class="keyword">this</span>;
     };
@@ -569,8 +547,7 @@ <h2>Backbone.Events</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-26">&#182;</a>
               </div>
-              <p>Aliases for backwards compatibility.
-</p>
+              <p>Aliases for backwards compatibility.</p>
 
             </div>
             
@@ -587,8 +564,7 @@ <h2>Backbone.Events</h2>
                 <a class="pilcrow" href="#section-27">&#182;</a>
               </div>
               <p>Allow the <code>Backbone</code> object to serve as a global event bus, for folks who
-want global &quot;pubsub&quot; in a convenient place.
-</p>
+want global &quot;pubsub&quot; in a convenient place.</p>
 
             </div>
             
@@ -619,26 +595,20 @@ <h2>Backbone.Model</h2>
               <p>Backbone <strong>Models</strong> are the basic data object in the framework --
 frequently representing a row in a table in a database on your server.
 A discrete chunk of data and a bunch of useful, related methods for
-performing computations and transformations on that data.
-
-</p>
+performing computations and transformations on that data.</p>
 <p>Create a new model with the specified attributes. A client id (<code>cid</code>)
-is automatically generated and assigned for you.
-</p>
+is automatically generated and assigned for you.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> Model = Backbone.Model = <span class="keyword">function</span>(attributes, options) {
-    <span class="keyword">var</span> defaults;
     <span class="keyword">var</span> attrs = attributes || {};
     options || (options = {});
     <span class="keyword">this</span>.cid = _.uniqueId(<span class="string">'c'</span>);
     <span class="keyword">this</span>.attributes = {};
-    _.extend(<span class="keyword">this</span>, _.pick(options, modelOptions));
+    <span class="keyword">if</span> (options.collection) <span class="keyword">this</span>.collection = options.collection;
     <span class="keyword">if</span> (options.parse) attrs = <span class="keyword">this</span>.parse(attrs, options) || {};
-    <span class="keyword">if</span> (defaults = _.result(<span class="keyword">this</span>, <span class="string">'defaults'</span>)) {
-      attrs = _.defaults({}, attrs, defaults);
-    }
+    attrs = _.defaults({}, attrs, _.result(<span class="keyword">this</span>, <span class="string">'defaults'</span>));
     <span class="keyword">this</span>.set(attrs, options);
     <span class="keyword">this</span>.changed = {};
     <span class="keyword">this</span>.initialize.apply(<span class="keyword">this</span>, arguments);
@@ -653,12 +623,11 @@ <h2>Backbone.Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-30">&#182;</a>
               </div>
-              <p>A list of options to be attached directly to the model, if provided.
-</p>
+              <p>Attach all inheritable methods to the Model prototype.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> modelOptions = [<span class="string">'url'</span>, <span class="string">'urlRoot'</span>, <span class="string">'collection'</span>];</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  _.extend(Model.prototype, Events, {</pre></div></div>
             
         </li>
         
@@ -669,12 +638,11 @@ <h2>Backbone.Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-31">&#182;</a>
               </div>
-              <p>Attach all inheritable methods to the Model prototype.
-</p>
+              <p>A hash of attributes whose current and previous value differ.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  _.extend(Model.prototype, Events, {</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    changed: <span class="literal">null</span>,</pre></div></div>
             
         </li>
         
@@ -685,12 +653,11 @@ <h2>Backbone.Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-32">&#182;</a>
               </div>
-              <p>A hash of attributes whose current and previous value differ.
-</p>
+              <p>The value returned during the last failed validation.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    changed: <span class="literal">null</span>,</pre></div></div>
+            <div class="content"><div class='highlight'><pre>    validationError: <span class="literal">null</span>,</pre></div></div>
             
         </li>
         
@@ -701,25 +668,8 @@ <h2>Backbone.Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-33">&#182;</a>
               </div>
-              <p>The value returned during the last failed validation.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    validationError: <span class="literal">null</span>,</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-34">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-34">&#182;</a>
-              </div>
               <p>The default name for the JSON <code>id</code> attribute is <code>&quot;id&quot;</code>. MongoDB and
-CouchDB users may want to set this to <code>&quot;_id&quot;</code>.
-</p>
+CouchDB users may want to set this to <code>&quot;_id&quot;</code>.</p>
 
             </div>
             
@@ -728,15 +678,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-35">
+        <li id="section-34">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-35">&#182;</a>
+                <a class="pilcrow" href="#section-34">&#182;</a>
               </div>
               <p>Initialize is an empty function by default. Override it with your own
-initialization logic.
-</p>
+initialization logic.</p>
 
             </div>
             
@@ -745,14 +694,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-36">
+        <li id="section-35">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-36">&#182;</a>
+                <a class="pilcrow" href="#section-35">&#182;</a>
               </div>
-              <p>Return a copy of the model&#39;s <code>attributes</code> object.
-</p>
+              <p>Return a copy of the model&#39;s <code>attributes</code> object.</p>
 
             </div>
             
@@ -763,15 +711,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-37">
+        <li id="section-36">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-37">&#182;</a>
+                <a class="pilcrow" href="#section-36">&#182;</a>
               </div>
               <p>Proxy <code>Backbone.sync</code> by default -- but override this if you need
-custom syncing semantics for <em>this</em> particular model.
-</p>
+custom syncing semantics for <em>this</em> particular model.</p>
 
             </div>
             
@@ -782,14 +729,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-38">
+        <li id="section-37">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-38">&#182;</a>
+                <a class="pilcrow" href="#section-37">&#182;</a>
               </div>
-              <p>Get the value of an attribute.
-</p>
+              <p>Get the value of an attribute.</p>
 
             </div>
             
@@ -800,14 +746,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-39">
+        <li id="section-38">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-39">&#182;</a>
+                <a class="pilcrow" href="#section-38">&#182;</a>
               </div>
-              <p>Get the HTML-escaped value of an attribute.
-</p>
+              <p>Get the HTML-escaped value of an attribute.</p>
 
             </div>
             
@@ -818,15 +763,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-40">
+        <li id="section-39">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-40">&#182;</a>
+                <a class="pilcrow" href="#section-39">&#182;</a>
               </div>
               <p>Returns <code>true</code> if the attribute contains a value that is not null
-or undefined.
-</p>
+or undefined.</p>
 
             </div>
             
@@ -837,16 +781,15 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-41">
+        <li id="section-40">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-41">&#182;</a>
+                <a class="pilcrow" href="#section-40">&#182;</a>
               </div>
               <p>Set a hash of model attributes on the object, firing <code>&quot;change&quot;</code>. This is
 the core primitive operation of a model, updating the data and notifying
-anyone who needs to know about the change in state. The heart of the beast.
-</p>
+anyone who needs to know about the change in state. The heart of the beast.</p>
 
             </div>
             
@@ -857,14 +800,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-42">
+        <li id="section-41">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-42">&#182;</a>
+                <a class="pilcrow" href="#section-41">&#182;</a>
               </div>
-              <p>Handle both <code>&quot;key&quot;, value</code> and <code>{key: value}</code> -style arguments.
-</p>
+              <p>Handle both <code>&quot;key&quot;, value</code> and <code>{key: value}</code> -style arguments.</p>
 
             </div>
             
@@ -880,14 +822,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-43">
+        <li id="section-42">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-43">&#182;</a>
+                <a class="pilcrow" href="#section-42">&#182;</a>
               </div>
-              <p>Run validation.
-</p>
+              <p>Run validation.</p>
 
             </div>
             
@@ -896,14 +837,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-44">
+        <li id="section-43">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-44">&#182;</a>
+                <a class="pilcrow" href="#section-43">&#182;</a>
               </div>
-              <p>Extract attributes and options.
-</p>
+              <p>Extract attributes and options.</p>
 
             </div>
             
@@ -922,14 +862,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-45">
+        <li id="section-44">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-45">&#182;</a>
+                <a class="pilcrow" href="#section-44">&#182;</a>
               </div>
-              <p>Check for changes of <code>id</code>.
-</p>
+              <p>Check for changes of <code>id</code>.</p>
 
             </div>
             
@@ -938,14 +877,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-46">
+        <li id="section-45">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-46">&#182;</a>
+                <a class="pilcrow" href="#section-45">&#182;</a>
               </div>
-              <p>For each <code>set</code> attribute, update or delete the current value.
-</p>
+              <p>For each <code>set</code> attribute, update or delete the current value.</p>
 
             </div>
             
@@ -963,14 +901,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-47">
+        <li id="section-46">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-47">&#182;</a>
+                <a class="pilcrow" href="#section-46">&#182;</a>
               </div>
-              <p>Trigger all relevant attribute changes.
-</p>
+              <p>Trigger all relevant attribute changes.</p>
 
             </div>
             
@@ -984,15 +921,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-48">
+        <li id="section-47">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-48">&#182;</a>
+                <a class="pilcrow" href="#section-47">&#182;</a>
               </div>
               <p>You might be wondering why there&#39;s a <code>while</code> loop here. Changes can
-be recursively nested within <code>&quot;change&quot;</code> events.
-</p>
+be recursively nested within <code>&quot;change&quot;</code> events.</p>
 
             </div>
             
@@ -1011,15 +947,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-49">
+        <li id="section-48">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-49">&#182;</a>
+                <a class="pilcrow" href="#section-48">&#182;</a>
               </div>
               <p>Remove an attribute from the model, firing <code>&quot;change&quot;</code>. <code>unset</code> is a noop
-if the attribute doesn&#39;t exist.
-</p>
+if the attribute doesn&#39;t exist.</p>
 
             </div>
             
@@ -1030,14 +965,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-50">
+        <li id="section-49">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-50">&#182;</a>
+                <a class="pilcrow" href="#section-49">&#182;</a>
               </div>
-              <p>Clear all attributes on the model, firing <code>&quot;change&quot;</code>.
-</p>
+              <p>Clear all attributes on the model, firing <code>&quot;change&quot;</code>.</p>
 
             </div>
             
@@ -1050,15 +984,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-51">
+        <li id="section-50">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-51">&#182;</a>
+                <a class="pilcrow" href="#section-50">&#182;</a>
               </div>
               <p>Determine if the model has changed since the last <code>&quot;change&quot;</code> event.
-If you specify an attribute name, determine if that attribute has changed.
-</p>
+If you specify an attribute name, determine if that attribute has changed.</p>
 
             </div>
             
@@ -1070,19 +1003,18 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-52">
+        <li id="section-51">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-52">&#182;</a>
+                <a class="pilcrow" href="#section-51">&#182;</a>
               </div>
               <p>Return an object containing all the attributes that have changed, or
 false if there are no changed attributes. Useful for determining what
 parts of a view need to be updated and/or what attributes need to be
 persisted to the server. Unset attributes will be set to undefined.
 You can also pass an attributes object to diff against the model,
-determining if there <em>would be</em> a change.
-</p>
+determining if there <em>would be</em> a change.</p>
 
             </div>
             
@@ -1100,15 +1032,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-53">
+        <li id="section-52">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-53">&#182;</a>
+                <a class="pilcrow" href="#section-52">&#182;</a>
               </div>
               <p>Get the previous value of an attribute, recorded at the time the last
-<code>&quot;change&quot;</code> event was fired.
-</p>
+<code>&quot;change&quot;</code> event was fired.</p>
 
             </div>
             
@@ -1120,15 +1051,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-54">
+        <li id="section-53">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-54">&#182;</a>
+                <a class="pilcrow" href="#section-53">&#182;</a>
               </div>
               <p>Get all of the attributes of the model at the time of the previous
-<code>&quot;change&quot;</code> event.
-</p>
+<code>&quot;change&quot;</code> event.</p>
 
             </div>
             
@@ -1139,16 +1069,15 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-55">
+        <li id="section-54">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-55">&#182;</a>
+                <a class="pilcrow" href="#section-54">&#182;</a>
               </div>
               <p>Fetch the model from the server. If the server&#39;s representation of the
 model differs from its current attributes, they will be overridden,
-triggering a <code>&quot;change&quot;</code> event.
-</p>
+triggering a <code>&quot;change&quot;</code> event.</p>
 
             </div>
             
@@ -1169,16 +1098,15 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-56">
+        <li id="section-55">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-56">&#182;</a>
+                <a class="pilcrow" href="#section-55">&#182;</a>
               </div>
               <p>Set a hash of model attributes, and sync the model to the server.
 If the server returns an attributes hash that differs, the model&#39;s
-state will be <code>set</code> again.
-</p>
+state will be <code>set</code> again.</p>
 
             </div>
             
@@ -1188,14 +1116,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-57">
+        <li id="section-56">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-57">&#182;</a>
+                <a class="pilcrow" href="#section-56">&#182;</a>
               </div>
-              <p>Handle both <code>&quot;key&quot;, value</code> and <code>{key: value}</code> -style arguments.
-</p>
+              <p>Handle both <code>&quot;key&quot;, value</code> and <code>{key: value}</code> -style arguments.</p>
 
             </div>
             
@@ -1204,53 +1131,41 @@ <h2>Backbone.Model</h2>
         options = val;
       } <span class="keyword">else</span> {
         (attrs = {})[key] = val;
-      }</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-58">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-58">&#182;</a>
-              </div>
-              <p>If we&#39;re not waiting and attributes exist, save acts as <code>set(attr).save(null, opts)</code>.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (attrs &amp;&amp; (!options || !options.wait) &amp;&amp; !<span class="keyword">this</span>.set(attrs, options)) <span class="keyword">return</span> <span class="literal">false</span>;
+      }
 
       options = _.extend({validate: <span class="literal">true</span>}, options);</pre></div></div>
             
         </li>
         
         
-        <li id="section-59">
+        <li id="section-57">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-59">&#182;</a>
+                <a class="pilcrow" href="#section-57">&#182;</a>
               </div>
-              <p>Do not persist invalid models.
-</p>
+              <p>If we&#39;re not waiting and attributes exist, save acts as
+<code>set(attr).save(null, opts)</code> with validation. Otherwise, check if
+the model will be valid when the attributes, if any, are set.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (!<span class="keyword">this</span>._validate(attrs, options)) <span class="keyword">return</span> <span class="literal">false</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (attrs &amp;&amp; !options.wait) {
+        <span class="keyword">if</span> (!<span class="keyword">this</span>.set(attrs, options)) <span class="keyword">return</span> <span class="literal">false</span>;
+      } <span class="keyword">else</span> {
+        <span class="keyword">if</span> (!<span class="keyword">this</span>._validate(attrs, options)) <span class="keyword">return</span> <span class="literal">false</span>;
+      }</pre></div></div>
             
         </li>
         
         
-        <li id="section-60">
+        <li id="section-58">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-60">&#182;</a>
+                <a class="pilcrow" href="#section-58">&#182;</a>
               </div>
-              <p>Set temporary attributes if <code>{wait: true}</code>.
-</p>
+              <p>Set temporary attributes if <code>{wait: true}</code>.</p>
 
             </div>
             
@@ -1261,15 +1176,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-61">
+        <li id="section-59">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-61">&#182;</a>
+                <a class="pilcrow" href="#section-59">&#182;</a>
               </div>
               <p>After a successful server-side save, the client is (optionally)
-updated with the server-side state.
-</p>
+updated with the server-side state.</p>
 
             </div>
             
@@ -1281,14 +1195,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-62">
+        <li id="section-60">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-62">&#182;</a>
+                <a class="pilcrow" href="#section-60">&#182;</a>
               </div>
-              <p>Ensure attributes are restored during synchronous saves.
-</p>
+              <p>Ensure attributes are restored during synchronous saves.</p>
 
             </div>
             
@@ -1310,14 +1223,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-63">
+        <li id="section-61">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-63">&#182;</a>
+                <a class="pilcrow" href="#section-61">&#182;</a>
               </div>
-              <p>Restore attributes.
-</p>
+              <p>Restore attributes.</p>
 
             </div>
             
@@ -1329,16 +1241,15 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-64">
+        <li id="section-62">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-64">&#182;</a>
+                <a class="pilcrow" href="#section-62">&#182;</a>
               </div>
               <p>Destroy this model on the server if it was already persisted.
 Optimistically removes the model from its collection, if it has one.
-If <code>wait: true</code> is passed, waits for the server to respond before removal.
-</p>
+If <code>wait: true</code> is passed, waits for the server to respond before removal.</p>
 
             </div>
             
@@ -1371,16 +1282,15 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-65">
+        <li id="section-63">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-65">&#182;</a>
+                <a class="pilcrow" href="#section-63">&#182;</a>
               </div>
               <p>Default URL for the model&#39;s representation on the server -- if you&#39;re
 using Backbone&#39;s restful methods, override this to change the endpoint
-that will be called.
-</p>
+that will be called.</p>
 
             </div>
             
@@ -1393,15 +1303,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-66">
+        <li id="section-64">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-66">&#182;</a>
+                <a class="pilcrow" href="#section-64">&#182;</a>
               </div>
               <p><strong>parse</strong> converts a response into the hash of attributes to be <code>set</code> on
-the model. The default implementation is just to pass the response along.
-</p>
+the model. The default implementation is just to pass the response along.</p>
 
             </div>
             
@@ -1412,14 +1321,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-67">
+        <li id="section-65">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-67">&#182;</a>
+                <a class="pilcrow" href="#section-65">&#182;</a>
               </div>
-              <p>Create a new model with identical attributes to this one.
-</p>
+              <p>Create a new model with identical attributes to this one.</p>
 
             </div>
             
@@ -1430,14 +1338,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-68">
+        <li id="section-66">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-68">&#182;</a>
+                <a class="pilcrow" href="#section-66">&#182;</a>
               </div>
-              <p>A model is new if it has never been saved to the server, and lacks an id.
-</p>
+              <p>A model is new if it has never been saved to the server, and lacks an id.</p>
 
             </div>
             
@@ -1448,14 +1355,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-69">
+        <li id="section-67">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-69">&#182;</a>
+                <a class="pilcrow" href="#section-67">&#182;</a>
               </div>
-              <p>Check if the model is currently in a valid state.
-</p>
+              <p>Check if the model is currently in a valid state.</p>
 
             </div>
             
@@ -1466,15 +1372,14 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-70">
+        <li id="section-68">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-70">&#182;</a>
+                <a class="pilcrow" href="#section-68">&#182;</a>
               </div>
               <p>Run validation against the next complete set of model attributes,
-returning <code>true</code> if all is well. Otherwise, fire an <code>&quot;invalid&quot;</code> event.
-</p>
+returning <code>true</code> if all is well. Otherwise, fire an <code>&quot;invalid&quot;</code> event.</p>
 
             </div>
             
@@ -1483,7 +1388,7 @@ <h2>Backbone.Model</h2>
       attrs = _.extend({}, <span class="keyword">this</span>.attributes, attrs);
       <span class="keyword">var</span> error = <span class="keyword">this</span>.validationError = <span class="keyword">this</span>.validate(attrs, options) || <span class="literal">null</span>;
       <span class="keyword">if</span> (!error) <span class="keyword">return</span> <span class="literal">true</span>;
-      <span class="keyword">this</span>.trigger(<span class="string">'invalid'</span>, <span class="keyword">this</span>, error, _.extend(options || {}, {validationError: error}));
+      <span class="keyword">this</span>.trigger(<span class="string">'invalid'</span>, <span class="keyword">this</span>, error, _.extend(options, {validationError: error}));
       <span class="keyword">return</span> <span class="literal">false</span>;
     }
 
@@ -1492,14 +1397,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-71">
+        <li id="section-69">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-71">&#182;</a>
+                <a class="pilcrow" href="#section-69">&#182;</a>
               </div>
-              <p>Underscore methods that we want to implement on the Model.
-</p>
+              <p>Underscore methods that we want to implement on the Model.</p>
 
             </div>
             
@@ -1508,14 +1412,13 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-72">
+        <li id="section-70">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-72">&#182;</a>
+                <a class="pilcrow" href="#section-70">&#182;</a>
               </div>
-              <p>Mix in each Underscore method as a proxy to <code>Model#attributes</code>.
-</p>
+              <p>Mix in each Underscore method as a proxy to <code>Model#attributes</code>.</p>
 
             </div>
             
@@ -1530,11 +1433,11 @@ <h2>Backbone.Model</h2>
         </li>
         
         
-        <li id="section-73">
+        <li id="section-71">
             <div class="annotation">
               
               <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-73">&#182;</a>
+                <a class="pilcrow" href="#section-71">&#182;</a>
               </div>
               <h2>Backbone.Collection</h2>
 
@@ -1543,30 +1446,26 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-74">
+        <li id="section-72">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-74">&#182;</a>
+                <a class="pilcrow" href="#section-72">&#182;</a>
               </div>
               <p>If models tend to represent a single row of data, a Backbone Collection is
 more analagous to a table full of data ... or a small slice or page of that
 table, or a collection of rows that belong together for a particular reason
 -- all of the messages in this particular folder, all of the documents
 belonging to this particular author, and so on. Collections maintain
-indexes of their models, both in order, and for lookup by <code>id</code>.
-
-</p>
+indexes of their models, both in order, and for lookup by <code>id</code>.</p>
 <p>Create a new <strong>Collection</strong>, perhaps to contain a specific type of <code>model</code>.
 If a <code>comparator</code> is specified, the Collection will maintain
-its models in sort order, as they&#39;re added and removed.
-</p>
+its models in sort order, as they&#39;re added and removed.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> Collection = Backbone.Collection = <span class="keyword">function</span>(models, options) {
     options || (options = {});
-    <span class="keyword">if</span> (options.url) <span class="keyword">this</span>.url = options.url;
     <span class="keyword">if</span> (options.model) <span class="keyword">this</span>.model = options.model;
     <span class="keyword">if</span> (options.comparator !== <span class="keyword">void</span> <span class="number">0</span>) <span class="keyword">this</span>.comparator = options.comparator;
     <span class="keyword">this</span>._reset();
@@ -1577,31 +1476,29 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-75">
+        <li id="section-73">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-75">&#182;</a>
+                <a class="pilcrow" href="#section-73">&#182;</a>
               </div>
-              <p>Default options for <code>Collection#set</code>.
-</p>
+              <p>Default options for <code>Collection#set</code>.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> setOptions = {add: <span class="literal">true</span>, remove: <span class="literal">true</span>, merge: <span class="literal">true</span>};
-  <span class="keyword">var</span> addOptions = {add: <span class="literal">true</span>, merge: <span class="literal">false</span>, remove: <span class="literal">false</span>};</pre></div></div>
+  <span class="keyword">var</span> addOptions = {add: <span class="literal">true</span>, remove: <span class="literal">false</span>};</pre></div></div>
             
         </li>
         
         
-        <li id="section-76">
+        <li id="section-74">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-76">&#182;</a>
+                <a class="pilcrow" href="#section-74">&#182;</a>
               </div>
-              <p>Define the Collection&#39;s inheritable methods.
-</p>
+              <p>Define the Collection&#39;s inheritable methods.</p>
 
             </div>
             
@@ -1610,15 +1507,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-77">
+        <li id="section-75">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-77">&#182;</a>
+                <a class="pilcrow" href="#section-75">&#182;</a>
               </div>
               <p>The default model for a collection is just a <strong>Backbone.Model</strong>.
-This should be overridden in most cases.
-</p>
+This should be overridden in most cases.</p>
 
             </div>
             
@@ -1627,15 +1523,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-78">
+        <li id="section-76">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-78">&#182;</a>
+                <a class="pilcrow" href="#section-76">&#182;</a>
               </div>
               <p>Initialize is an empty function by default. Override it with your own
-initialization logic.
-</p>
+initialization logic.</p>
 
             </div>
             
@@ -1644,15 +1539,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-79">
+        <li id="section-77">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-79">&#182;</a>
+                <a class="pilcrow" href="#section-77">&#182;</a>
               </div>
               <p>The JSON representation of a Collection is an array of the
-models&#39; attributes.
-</p>
+models&#39; attributes.</p>
 
             </div>
             
@@ -1663,14 +1557,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-80">
+        <li id="section-78">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-80">&#182;</a>
+                <a class="pilcrow" href="#section-78">&#182;</a>
               </div>
-              <p>Proxy <code>Backbone.sync</code> by default.
-</p>
+              <p>Proxy <code>Backbone.sync</code> by default.</p>
 
             </div>
             
@@ -1681,41 +1574,40 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-81">
+        <li id="section-79">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-81">&#182;</a>
+                <a class="pilcrow" href="#section-79">&#182;</a>
               </div>
-              <p>Add a model, or list of models to the set.
-</p>
+              <p>Add a model, or list of models to the set.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    add: <span class="keyword">function</span>(models, options) {
-      <span class="keyword">return</span> <span class="keyword">this</span>.set(models, _.defaults(options || {}, addOptions));
+      <span class="keyword">return</span> <span class="keyword">this</span>.set(models, _.extend({merge: <span class="literal">false</span>}, options, addOptions));
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-82">
+        <li id="section-80">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-82">&#182;</a>
+                <a class="pilcrow" href="#section-80">&#182;</a>
               </div>
-              <p>Remove a model, or a list of models from the set.
-</p>
+              <p>Remove a model, or a list of models from the set.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    remove: <span class="keyword">function</span>(models, options) {
-      models = _.isArray(models) ? models.slice() : [models];
+      <span class="keyword">var</span> singular = !_.isArray(models);
+      models = singular ? [models] : _.clone(models);
       options || (options = {});
       <span class="keyword">var</span> i, l, index, model;
       <span class="keyword">for</span> (i = <span class="number">0</span>, l = models.length; i &lt; l; i++) {
-        model = <span class="keyword">this</span>.get(models[i]);
+        model = models[i] = <span class="keyword">this</span>.get(models[i]);
         <span class="keyword">if</span> (!model) <span class="keyword">continue</span>;
         <span class="keyword">delete</span> <span class="keyword">this</span>._byId[model.id];
         <span class="keyword">delete</span> <span class="keyword">this</span>._byId[model.cid];
@@ -1728,105 +1620,114 @@ <h2>Backbone.Collection</h2>
         }
         <span class="keyword">this</span>._removeReference(model);
       }
-      <span class="keyword">return</span> <span class="keyword">this</span>;
+      <span class="keyword">return</span> singular ? models[<span class="number">0</span>] : models;
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-83">
+        <li id="section-81">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-83">&#182;</a>
+                <a class="pilcrow" href="#section-81">&#182;</a>
               </div>
               <p>Update a collection by <code>set</code>-ing a new list of models, adding new ones,
 removing models that are no longer present, and merging models that
 already exist in the collection, as necessary. Similar to <strong>Model#set</strong>,
-the core operation for updating the data contained by the collection.
-</p>
+the core operation for updating the data contained by the collection.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    set: <span class="keyword">function</span>(models, options) {
-      options = _.defaults(options || {}, setOptions);
+      options = _.defaults({}, options, setOptions);
       <span class="keyword">if</span> (options.parse) models = <span class="keyword">this</span>.parse(models, options);
-      <span class="keyword">if</span> (!_.isArray(models)) models = models ? [models] : [];
-      <span class="keyword">var</span> i, l, model, attrs, existing, sort;
+      <span class="keyword">var</span> singular = !_.isArray(models);
+      models = singular ? (models ? [models] : []) : _.clone(models);
+      <span class="keyword">var</span> i, l, id, model, attrs, existing, sort;
       <span class="keyword">var</span> at = options.at;
+      <span class="keyword">var</span> targetModel = <span class="keyword">this</span>.model;
       <span class="keyword">var</span> sortable = <span class="keyword">this</span>.comparator &amp;&amp; (at == <span class="literal">null</span>) &amp;&amp; options.sort !== <span class="literal">false</span>;
       <span class="keyword">var</span> sortAttr = _.isString(<span class="keyword">this</span>.comparator) ? <span class="keyword">this</span>.comparator : <span class="literal">null</span>;
-      <span class="keyword">var</span> toAdd = [], toRemove = [], modelMap = {};</pre></div></div>
+      <span class="keyword">var</span> toAdd = [], toRemove = [], modelMap = {};
+      <span class="keyword">var</span> add = options.add, merge = options.merge, remove = options.remove;
+      <span class="keyword">var</span> order = !sortable &amp;&amp; add &amp;&amp; remove ? [] : <span class="literal">false</span>;</pre></div></div>
             
         </li>
         
         
-        <li id="section-84">
+        <li id="section-82">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-84">&#182;</a>
+                <a class="pilcrow" href="#section-82">&#182;</a>
               </div>
               <p>Turn bare objects into model references, and prevent invalid models
-from being added.
-</p>
+from being added.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>      <span class="keyword">for</span> (i = <span class="number">0</span>, l = models.length; i &lt; l; i++) {
-        <span class="keyword">if</span> (!(model = <span class="keyword">this</span>._prepareModel(models[i], options))) <span class="keyword">continue</span>;</pre></div></div>
+        attrs = models[i];
+        <span class="keyword">if</span> (attrs <span class="keyword">instanceof</span> Model) {
+          id = model = attrs;
+        } <span class="keyword">else</span> {
+          id = attrs[targetModel.prototype.idAttribute];
+        }</pre></div></div>
             
         </li>
         
         
-        <li id="section-85">
+        <li id="section-83">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-85">&#182;</a>
+                <a class="pilcrow" href="#section-83">&#182;</a>
               </div>
               <p>If a duplicate is found, prevent it from being added and
-optionally merge it into the existing model.
-</p>
+optionally merge it into the existing model.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        <span class="keyword">if</span> (existing = <span class="keyword">this</span>.get(model)) {
-          <span class="keyword">if</span> (options.remove) modelMap[existing.cid] = <span class="literal">true</span>;
-          <span class="keyword">if</span> (options.merge) {
-            existing.set(model.attributes, options);
+            <div class="content"><div class='highlight'><pre>        <span class="keyword">if</span> (existing = <span class="keyword">this</span>.get(id)) {
+          <span class="keyword">if</span> (remove) modelMap[existing.cid] = <span class="literal">true</span>;
+          <span class="keyword">if</span> (merge) {
+            attrs = attrs === model ? model.attributes : attrs;
+            <span class="keyword">if</span> (options.parse) attrs = existing.parse(attrs, options);
+            existing.set(attrs, options);
             <span class="keyword">if</span> (sortable &amp;&amp; !sort &amp;&amp; existing.hasChanged(sortAttr)) sort = <span class="literal">true</span>;
-          }</pre></div></div>
+          }
+          models[i] = existing;</pre></div></div>
             
         </li>
         
         
-        <li id="section-86">
+        <li id="section-84">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-86">&#182;</a>
+                <a class="pilcrow" href="#section-84">&#182;</a>
               </div>
-              <p>This is a new model, push it to the <code>toAdd</code> list.
-</p>
+              <p>If this is a new, valid model, push it to the <code>toAdd</code> list.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        } <span class="keyword">else</span> <span class="keyword">if</span> (options.add) {
+            <div class="content"><div class='highlight'><pre>        } <span class="keyword">else</span> <span class="keyword">if</span> (add) {
+          model = models[i] = <span class="keyword">this</span>._prepareModel(attrs, options);
+          <span class="keyword">if</span> (!model) <span class="keyword">continue</span>;
           toAdd.push(model);</pre></div></div>
             
         </li>
         
         
-        <li id="section-87">
+        <li id="section-85">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-87">&#182;</a>
+                <a class="pilcrow" href="#section-85">&#182;</a>
               </div>
               <p>Listen to added models&#39; events, and index models for lookup by
-<code>id</code> and by <code>cid</code>.
-</p>
+<code>id</code> and by <code>cid</code>.</p>
 
             </div>
             
@@ -1834,23 +1735,23 @@ <h2>Backbone.Collection</h2>
           <span class="keyword">this</span>._byId[model.cid] = model;
           <span class="keyword">if</span> (model.id != <span class="literal">null</span>) <span class="keyword">this</span>._byId[model.id] = model;
         }
+        <span class="keyword">if</span> (order) order.push(existing || model);
       }</pre></div></div>
             
         </li>
         
         
-        <li id="section-88">
+        <li id="section-86">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-88">&#182;</a>
+                <a class="pilcrow" href="#section-86">&#182;</a>
               </div>
-              <p>Remove nonexistent models if appropriate.
-</p>
+              <p>Remove nonexistent models if appropriate.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (options.remove) {
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (remove) {
         <span class="keyword">for</span> (i = <span class="number">0</span>, l = <span class="keyword">this</span>.length; i &lt; l; ++i) {
           <span class="keyword">if</span> (!modelMap[(model = <span class="keyword">this</span>.models[i]).cid]) toRemove.push(model);
         }
@@ -1860,95 +1761,96 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-89">
+        <li id="section-87">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-89">&#182;</a>
+                <a class="pilcrow" href="#section-87">&#182;</a>
               </div>
-              <p>See if sorting is needed, update <code>length</code> and splice in new models.
-</p>
+              <p>See if sorting is needed, update <code>length</code> and splice in new models.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (toAdd.length) {
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (toAdd.length || (order &amp;&amp; order.length)) {
         <span class="keyword">if</span> (sortable) sort = <span class="literal">true</span>;
         <span class="keyword">this</span>.length += toAdd.length;
         <span class="keyword">if</span> (at != <span class="literal">null</span>) {
-          splice.apply(<span class="keyword">this</span>.models, [at, <span class="number">0</span>].concat(toAdd));
+          <span class="keyword">for</span> (i = <span class="number">0</span>, l = toAdd.length; i &lt; l; i++) {
+            <span class="keyword">this</span>.models.splice(at + i, <span class="number">0</span>, toAdd[i]);
+          }
         } <span class="keyword">else</span> {
-          push.apply(<span class="keyword">this</span>.models, toAdd);
+          <span class="keyword">if</span> (order) <span class="keyword">this</span>.models.length = <span class="number">0</span>;
+          <span class="keyword">var</span> orderedModels = order || toAdd;
+          <span class="keyword">for</span> (i = <span class="number">0</span>, l = orderedModels.length; i &lt; l; i++) {
+            <span class="keyword">this</span>.models.push(orderedModels[i]);
+          }
         }
       }</pre></div></div>
             
         </li>
         
         
-        <li id="section-90">
+        <li id="section-88">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-90">&#182;</a>
+                <a class="pilcrow" href="#section-88">&#182;</a>
               </div>
-              <p>Silently sort the collection if appropriate.
-</p>
+              <p>Silently sort the collection if appropriate.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (sort) <span class="keyword">this</span>.sort({silent: <span class="literal">true</span>});
-
-      <span class="keyword">if</span> (options.silent) <span class="keyword">return</span> <span class="keyword">this</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (sort) <span class="keyword">this</span>.sort({silent: <span class="literal">true</span>});</pre></div></div>
             
         </li>
         
         
-        <li id="section-91">
+        <li id="section-89">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-91">&#182;</a>
+                <a class="pilcrow" href="#section-89">&#182;</a>
               </div>
-              <p>Trigger <code>add</code> events.
-</p>
+              <p>Unless silenced, it&#39;s time to fire all appropriate add/sort events.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">for</span> (i = <span class="number">0</span>, l = toAdd.length; i &lt; l; i++) {
-        (model = toAdd[i]).trigger(<span class="string">'add'</span>, model, <span class="keyword">this</span>, options);
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (!options.silent) {
+        <span class="keyword">for</span> (i = <span class="number">0</span>, l = toAdd.length; i &lt; l; i++) {
+          (model = toAdd[i]).trigger(<span class="string">'add'</span>, model, <span class="keyword">this</span>, options);
+        }
+        <span class="keyword">if</span> (sort || (order &amp;&amp; order.length)) <span class="keyword">this</span>.trigger(<span class="string">'sort'</span>, <span class="keyword">this</span>, options);
       }</pre></div></div>
             
         </li>
         
         
-        <li id="section-92">
+        <li id="section-90">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-92">&#182;</a>
+                <a class="pilcrow" href="#section-90">&#182;</a>
               </div>
-              <p>Trigger <code>sort</code> if the collection was sorted.
-</p>
+              <p>Return the added (or merged) model (or models).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (sort) <span class="keyword">this</span>.trigger(<span class="string">'sort'</span>, <span class="keyword">this</span>, options);
-      <span class="keyword">return</span> <span class="keyword">this</span>;
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">return</span> singular ? models[<span class="number">0</span>] : models;
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-93">
+        <li id="section-91">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-93">&#182;</a>
+                <a class="pilcrow" href="#section-91">&#182;</a>
               </div>
               <p>When you have more items than you want to add or remove individually,
 you can reset the entire set with a new list of models, without firing
 any granular <code>add</code> or <code>remove</code> events. Fires <code>reset</code> when finished.
-Useful for bulk operations and optimizations.
-</p>
+Useful for bulk operations and optimizations.</p>
 
             </div>
             
@@ -1959,42 +1861,38 @@ <h2>Backbone.Collection</h2>
       }
       options.previousModels = <span class="keyword">this</span>.models;
       <span class="keyword">this</span>._reset();
-      <span class="keyword">this</span>.add(models, _.extend({silent: <span class="literal">true</span>}, options));
+      models = <span class="keyword">this</span>.add(models, _.extend({silent: <span class="literal">true</span>}, options));
       <span class="keyword">if</span> (!options.silent) <span class="keyword">this</span>.trigger(<span class="string">'reset'</span>, <span class="keyword">this</span>, options);
-      <span class="keyword">return</span> <span class="keyword">this</span>;
+      <span class="keyword">return</span> models;
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-94">
+        <li id="section-92">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-94">&#182;</a>
+                <a class="pilcrow" href="#section-92">&#182;</a>
               </div>
-              <p>Add a model to the end of the collection.
-</p>
+              <p>Add a model to the end of the collection.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    push: <span class="keyword">function</span>(model, options) {
-      model = <span class="keyword">this</span>._prepareModel(model, options);
-      <span class="keyword">this</span>.add(model, _.extend({at: <span class="keyword">this</span>.length}, options));
-      <span class="keyword">return</span> model;
+      <span class="keyword">return</span> <span class="keyword">this</span>.add(model, _.extend({at: <span class="keyword">this</span>.length}, options));
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-95">
+        <li id="section-93">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-95">&#182;</a>
+                <a class="pilcrow" href="#section-93">&#182;</a>
               </div>
-              <p>Remove a model from the end of the collection.
-</p>
+              <p>Remove a model from the end of the collection.</p>
 
             </div>
             
@@ -2007,34 +1905,30 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-96">
+        <li id="section-94">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-96">&#182;</a>
+                <a class="pilcrow" href="#section-94">&#182;</a>
               </div>
-              <p>Add a model to the beginning of the collection.
-</p>
+              <p>Add a model to the beginning of the collection.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    unshift: <span class="keyword">function</span>(model, options) {
-      model = <span class="keyword">this</span>._prepareModel(model, options);
-      <span class="keyword">this</span>.add(model, _.extend({at: <span class="number">0</span>}, options));
-      <span class="keyword">return</span> model;
+      <span class="keyword">return</span> <span class="keyword">this</span>.add(model, _.extend({at: <span class="number">0</span>}, options));
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-97">
+        <li id="section-95">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-97">&#182;</a>
+                <a class="pilcrow" href="#section-95">&#182;</a>
               </div>
-              <p>Remove a model from the beginning of the collection.
-</p>
+              <p>Remove a model from the beginning of the collection.</p>
 
             </div>
             
@@ -2047,51 +1941,48 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-98">
+        <li id="section-96">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-98">&#182;</a>
+                <a class="pilcrow" href="#section-96">&#182;</a>
               </div>
-              <p>Slice out a sub-array of models from the collection.
-</p>
+              <p>Slice out a sub-array of models from the collection.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    slice: <span class="keyword">function</span>(begin, end) {
-      <span class="keyword">return</span> <span class="keyword">this</span>.models.slice(begin, end);
+            <div class="content"><div class='highlight'><pre>    slice: <span class="keyword">function</span>() {
+      <span class="keyword">return</span> slice.apply(<span class="keyword">this</span>.models, arguments);
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-99">
+        <li id="section-97">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-99">&#182;</a>
+                <a class="pilcrow" href="#section-97">&#182;</a>
               </div>
-              <p>Get a model from the set by id.
-</p>
+              <p>Get a model from the set by id.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    get: <span class="keyword">function</span>(obj) {
       <span class="keyword">if</span> (obj == <span class="literal">null</span>) <span class="keyword">return</span> <span class="keyword">void</span> <span class="number">0</span>;
-      <span class="keyword">return</span> <span class="keyword">this</span>._byId[obj.id != <span class="literal">null</span> ? obj.id : obj.cid || obj];
+      <span class="keyword">return</span> <span class="keyword">this</span>._byId[obj.id] || <span class="keyword">this</span>._byId[obj.cid] || <span class="keyword">this</span>._byId[obj];
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-100">
+        <li id="section-98">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-100">&#182;</a>
+                <a class="pilcrow" href="#section-98">&#182;</a>
               </div>
-              <p>Get the model at the given index.
-</p>
+              <p>Get the model at the given index.</p>
 
             </div>
             
@@ -2102,15 +1993,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-101">
+        <li id="section-99">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-101">&#182;</a>
+                <a class="pilcrow" href="#section-99">&#182;</a>
               </div>
               <p>Return models with matching attributes. Useful for simple cases of
-<code>filter</code>.
-</p>
+<code>filter</code>.</p>
 
             </div>
             
@@ -2127,15 +2017,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-102">
+        <li id="section-100">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-102">&#182;</a>
+                <a class="pilcrow" href="#section-100">&#182;</a>
               </div>
               <p>Return the first model with matching attributes. Useful for simple cases
-of <code>find</code>.
-</p>
+of <code>find</code>.</p>
 
             </div>
             
@@ -2146,16 +2035,15 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-103">
+        <li id="section-101">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-103">&#182;</a>
+                <a class="pilcrow" href="#section-101">&#182;</a>
               </div>
               <p>Force the collection to re-sort itself. You don&#39;t need to call this under
 normal circumstances, as the set will maintain sort order as each item
-is added.
-</p>
+is added.</p>
 
             </div>
             
@@ -2166,14 +2054,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-104">
+        <li id="section-102">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-104">&#182;</a>
+                <a class="pilcrow" href="#section-102">&#182;</a>
               </div>
-              <p>Run sort based on type of <code>comparator</code>.
-</p>
+              <p>Run sort based on type of <code>comparator</code>.</p>
 
             </div>
             
@@ -2190,37 +2077,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-105">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-105">&#182;</a>
-              </div>
-              <p>Figure out the smallest index at which a model should be inserted so as
-to maintain order.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    sortedIndex: <span class="keyword">function</span>(model, value, context) {
-      value || (value = <span class="keyword">this</span>.comparator);
-      <span class="keyword">var</span> iterator = _.isFunction(value) ? value : <span class="keyword">function</span>(model) {
-        <span class="keyword">return</span> model.get(value);
-      };
-      <span class="keyword">return</span> _.sortedIndex(<span class="keyword">this</span>.models, model, iterator, context);
-    },</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-106">
+        <li id="section-103">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-106">&#182;</a>
+                <a class="pilcrow" href="#section-103">&#182;</a>
               </div>
-              <p>Pluck an attribute from each model in the collection.
-</p>
+              <p>Pluck an attribute from each model in the collection.</p>
 
             </div>
             
@@ -2231,16 +2094,15 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-107">
+        <li id="section-104">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-107">&#182;</a>
+                <a class="pilcrow" href="#section-104">&#182;</a>
               </div>
               <p>Fetch the default set of models for this collection, resetting the
 collection when they arrive. If <code>reset: true</code> is passed, the response
-data will be passed through the <code>reset</code> method instead of <code>set</code>.
-</p>
+data will be passed through the <code>reset</code> method instead of <code>set</code>.</p>
 
             </div>
             
@@ -2262,16 +2124,15 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-108">
+        <li id="section-105">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-108">&#182;</a>
+                <a class="pilcrow" href="#section-105">&#182;</a>
               </div>
               <p>Create a new instance of a model in this collection. Add the model to the
 collection immediately, unless <code>wait: true</code> is passed, in which case we
-wait for the server to agree.
-</p>
+wait for the server to agree.</p>
 
             </div>
             
@@ -2281,7 +2142,7 @@ <h2>Backbone.Collection</h2>
       <span class="keyword">if</span> (!options.wait) <span class="keyword">this</span>.add(model, options);
       <span class="keyword">var</span> collection = <span class="keyword">this</span>;
       <span class="keyword">var</span> success = options.success;
-      options.success = <span class="keyword">function</span>(resp) {
+      options.success = <span class="keyword">function</span>(model, resp, options) {
         <span class="keyword">if</span> (options.wait) collection.add(model, options);
         <span class="keyword">if</span> (success) success(model, resp, options);
       };
@@ -2292,15 +2153,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-109">
+        <li id="section-106">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-109">&#182;</a>
+                <a class="pilcrow" href="#section-106">&#182;</a>
               </div>
               <p><strong>parse</strong> converts a response into a list of models to be added to the
-collection. The default implementation is just to pass it through.
-</p>
+collection. The default implementation is just to pass it through.</p>
 
             </div>
             
@@ -2311,14 +2171,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-110">
+        <li id="section-107">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-110">&#182;</a>
+                <a class="pilcrow" href="#section-107">&#182;</a>
               </div>
-              <p>Create a new collection with an identical list of models as this one.
-</p>
+              <p>Create a new collection with an identical list of models as this one.</p>
 
             </div>
             
@@ -2329,15 +2188,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-111">
+        <li id="section-108">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-111">&#182;</a>
+                <a class="pilcrow" href="#section-108">&#182;</a>
               </div>
               <p>Private method to reset all internal state. Called when the collection
-is first initialized or reset.
-</p>
+is first initialized or reset.</p>
 
             </div>
             
@@ -2350,15 +2208,14 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-112">
+        <li id="section-109">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-112">&#182;</a>
+                <a class="pilcrow" href="#section-109">&#182;</a>
               </div>
               <p>Prepare a hash of attributes (or other model) to be added to this
-collection.
-</p>
+collection.</p>
 
             </div>
             
@@ -2367,27 +2224,24 @@ <h2>Backbone.Collection</h2>
         <span class="keyword">if</span> (!attrs.collection) attrs.collection = <span class="keyword">this</span>;
         <span class="keyword">return</span> attrs;
       }
-      options || (options = {});
+      options = options ? _.clone(options) : {};
       options.collection = <span class="keyword">this</span>;
       <span class="keyword">var</span> model = <span class="keyword">new</span> <span class="keyword">this</span>.model(attrs, options);
-      <span class="keyword">if</span> (!model._validate(attrs, options)) {
-        <span class="keyword">this</span>.trigger(<span class="string">'invalid'</span>, <span class="keyword">this</span>, attrs, options);
-        <span class="keyword">return</span> <span class="literal">false</span>;
-      }
-      <span class="keyword">return</span> model;
+      <span class="keyword">if</span> (!model.validationError) <span class="keyword">return</span> model;
+      <span class="keyword">this</span>.trigger(<span class="string">'invalid'</span>, <span class="keyword">this</span>, model.validationError, options);
+      <span class="keyword">return</span> <span class="literal">false</span>;
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-113">
+        <li id="section-110">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-113">&#182;</a>
+                <a class="pilcrow" href="#section-110">&#182;</a>
               </div>
-              <p>Internal method to sever a model&#39;s ties to a collection.
-</p>
+              <p>Internal method to sever a model&#39;s ties to a collection.</p>
 
             </div>
             
@@ -2399,17 +2253,16 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-114">
+        <li id="section-111">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-114">&#182;</a>
+                <a class="pilcrow" href="#section-111">&#182;</a>
               </div>
               <p>Internal method called every time a model in the set fires an event.
 Sets need to update their indexes when models change ids. All other
 events simply proxy through. &quot;add&quot; and &quot;remove&quot; events that originate
-in other collections are ignored.
-</p>
+in other collections are ignored.</p>
 
             </div>
             
@@ -2428,16 +2281,15 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-115">
+        <li id="section-112">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-115">&#182;</a>
+                <a class="pilcrow" href="#section-112">&#182;</a>
               </div>
               <p>Underscore methods that we want to implement on the Collection.
 90% of the core usefulness of Backbone Collections is actually implemented
-right here:
-</p>
+right here:</p>
 
             </div>
             
@@ -2445,20 +2297,19 @@ <h2>Backbone.Collection</h2>
     <span class="string">'inject'</span>, <span class="string">'reduceRight'</span>, <span class="string">'foldr'</span>, <span class="string">'find'</span>, <span class="string">'detect'</span>, <span class="string">'filter'</span>, <span class="string">'select'</span>,
     <span class="string">'reject'</span>, <span class="string">'every'</span>, <span class="string">'all'</span>, <span class="string">'some'</span>, <span class="string">'any'</span>, <span class="string">'include'</span>, <span class="string">'contains'</span>, <span class="string">'invoke'</span>,
     <span class="string">'max'</span>, <span class="string">'min'</span>, <span class="string">'toArray'</span>, <span class="string">'size'</span>, <span class="string">'first'</span>, <span class="string">'head'</span>, <span class="string">'take'</span>, <span class="string">'initial'</span>, <span class="string">'rest'</span>,
-    <span class="string">'tail'</span>, <span class="string">'drop'</span>, <span class="string">'last'</span>, <span class="string">'without'</span>, <span class="string">'indexOf'</span>, <span class="string">'shuffle'</span>, <span class="string">'lastIndexOf'</span>,
-    <span class="string">'isEmpty'</span>, <span class="string">'chain'</span>];</pre></div></div>
+    <span class="string">'tail'</span>, <span class="string">'drop'</span>, <span class="string">'last'</span>, <span class="string">'without'</span>, <span class="string">'difference'</span>, <span class="string">'indexOf'</span>, <span class="string">'shuffle'</span>,
+    <span class="string">'lastIndexOf'</span>, <span class="string">'isEmpty'</span>, <span class="string">'chain'</span>];</pre></div></div>
             
         </li>
         
         
-        <li id="section-116">
+        <li id="section-113">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-116">&#182;</a>
+                <a class="pilcrow" href="#section-113">&#182;</a>
               </div>
-              <p>Mix in each Underscore method as a proxy to <code>Collection#models</code>.
-</p>
+              <p>Mix in each Underscore method as a proxy to <code>Collection#models</code>.</p>
 
             </div>
             
@@ -2473,14 +2324,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-117">
+        <li id="section-114">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-117">&#182;</a>
+                <a class="pilcrow" href="#section-114">&#182;</a>
               </div>
-              <p>Underscore methods that take a property name as an argument.
-</p>
+              <p>Underscore methods that take a property name as an argument.</p>
 
             </div>
             
@@ -2489,14 +2339,13 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-118">
+        <li id="section-115">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-118">&#182;</a>
+                <a class="pilcrow" href="#section-115">&#182;</a>
               </div>
-              <p>Use attributes instead of properties.
-</p>
+              <p>Use attributes instead of properties.</p>
 
             </div>
             
@@ -2512,11 +2361,11 @@ <h2>Backbone.Collection</h2>
         </li>
         
         
-        <li id="section-119">
+        <li id="section-116">
             <div class="annotation">
               
               <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-119">&#182;</a>
+                <a class="pilcrow" href="#section-116">&#182;</a>
               </div>
               <h2>Backbone.View</h2>
 
@@ -2525,11 +2374,11 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-120">
+        <li id="section-117">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-120">&#182;</a>
+                <a class="pilcrow" href="#section-117">&#182;</a>
               </div>
               <p>Backbone Views are almost more convention than they are actual code. A View
 is simply a JavaScript object that represents a logical chunk of UI in the
@@ -2537,18 +2386,16 @@ <h2>Backbone.View</h2>
 even the surrounding frame which wraps your whole app. Defining a chunk of
 UI as a <strong>View</strong> allows you to define your DOM events declaratively, without
 having to worry about render order ... and makes it easy for the view to
-react to specific changes in the state of your models.
-
-</p>
+react to specific changes in the state of your models.</p>
 <p>Creating a Backbone.View creates its initial element outside of the DOM,
-if an existing element is not provided...
-</p>
+if an existing element is not provided...</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> View = Backbone.View = <span class="keyword">function</span>(options) {
     <span class="keyword">this</span>.cid = _.uniqueId(<span class="string">'view'</span>);
-    <span class="keyword">this</span>._configure(options || {});
+    options || (options = {});
+    _.extend(<span class="keyword">this</span>, _.pick(options, viewOptions));
     <span class="keyword">this</span>._ensureElement();
     <span class="keyword">this</span>.initialize.apply(<span class="keyword">this</span>, arguments);
     <span class="keyword">this</span>.delegateEvents();
@@ -2557,14 +2404,13 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-121">
+        <li id="section-118">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-121">&#182;</a>
+                <a class="pilcrow" href="#section-118">&#182;</a>
               </div>
-              <p>Cached regex to split keys for <code>delegate</code>.
-</p>
+              <p>Cached regex to split keys for <code>delegate</code>.</p>
 
             </div>
             
@@ -2573,14 +2419,13 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-122">
+        <li id="section-119">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-122">&#182;</a>
+                <a class="pilcrow" href="#section-119">&#182;</a>
               </div>
-              <p>List of view options to be merged as properties.
-</p>
+              <p>List of view options to be merged as properties.</p>
 
             </div>
             
@@ -2589,14 +2434,13 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-123">
+        <li id="section-120">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-123">&#182;</a>
+                <a class="pilcrow" href="#section-120">&#182;</a>
               </div>
-              <p>Set up all inheritable <strong>Backbone.View</strong> properties and methods.
-</p>
+              <p>Set up all inheritable <strong>Backbone.View</strong> properties and methods.</p>
 
             </div>
             
@@ -2605,14 +2449,13 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-124">
+        <li id="section-121">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-124">&#182;</a>
+                <a class="pilcrow" href="#section-121">&#182;</a>
               </div>
-              <p>The default <code>tagName</code> of a View&#39;s element is <code>&quot;div&quot;</code>.
-</p>
+              <p>The default <code>tagName</code> of a View&#39;s element is <code>&quot;div&quot;</code>.</p>
 
             </div>
             
@@ -2621,15 +2464,14 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-125">
+        <li id="section-122">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-125">&#182;</a>
+                <a class="pilcrow" href="#section-122">&#182;</a>
               </div>
               <p>jQuery delegate for element lookup, scoped to DOM elements within the
-current view. This should be prefered to global lookups where possible.
-</p>
+current view. This should be preferred to global lookups where possible.</p>
 
             </div>
             
@@ -2640,15 +2482,14 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-126">
+        <li id="section-123">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-126">&#182;</a>
+                <a class="pilcrow" href="#section-123">&#182;</a>
               </div>
               <p>Initialize is an empty function by default. Override it with your own
-initialization logic.
-</p>
+initialization logic.</p>
 
             </div>
             
@@ -2657,16 +2498,15 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-127">
+        <li id="section-124">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-127">&#182;</a>
+                <a class="pilcrow" href="#section-124">&#182;</a>
               </div>
               <p><strong>render</strong> is the core function that your view should override, in order
 to populate its element (<code>this.el</code>), with the appropriate HTML. The
-convention is for <strong>render</strong> to always return <code>this</code>.
-</p>
+convention is for <strong>render</strong> to always return <code>this</code>.</p>
 
             </div>
             
@@ -2677,15 +2517,14 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-128">
+        <li id="section-125">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-128">&#182;</a>
+                <a class="pilcrow" href="#section-125">&#182;</a>
               </div>
               <p>Remove this view by taking the element out of the DOM, and removing any
-applicable Backbone.Events listeners.
-</p>
+applicable Backbone.Events listeners.</p>
 
             </div>
             
@@ -2698,15 +2537,14 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-129">
+        <li id="section-126">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-129">&#182;</a>
+                <a class="pilcrow" href="#section-126">&#182;</a>
               </div>
               <p>Change the view&#39;s element (<code>this.el</code> property), including event
-re-delegation.
-</p>
+re-delegation.</p>
 
             </div>
             
@@ -2721,29 +2559,24 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-130">
+        <li id="section-127">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-130">&#182;</a>
+                <a class="pilcrow" href="#section-127">&#182;</a>
               </div>
-              <p>Set callbacks, where <code>this.events</code> is a hash of
-
-</p>
-<p><em>{&quot;event selector&quot;: &quot;callback&quot;}</em>
-
-</p>
+              <p>Set callbacks, where <code>this.events</code> is a hash of</p>
+<p><em>{&quot;event selector&quot;: &quot;callback&quot;}</em></p>
 <pre><code>{
   &#39;mousedown .title&#39;:  &#39;edit&#39;,
-  &#39;click .button&#39;:     &#39;save&#39;
+  &#39;click .button&#39;:     &#39;save&#39;,
   &#39;click .open&#39;:       function(e) { ... }
 }</code></pre>
 <p>pairs. Callbacks will be bound to the view, with <code>this</code> set properly.
 Uses event delegation for efficiency.
 Omitting the selector binds the event to <code>this.el</code>.
 This only works for delegate-able events: not <code>focus</code>, <code>blur</code>, and
-not <code>change</code>, <code>submit</code>, and <code>reset</code> in Internet Explorer.
-</p>
+not <code>change</code>, <code>submit</code>, and <code>reset</code> in Internet Explorer.</p>
 
             </div>
             
@@ -2771,16 +2604,15 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-131">
+        <li id="section-128">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-131">&#182;</a>
+                <a class="pilcrow" href="#section-128">&#182;</a>
               </div>
               <p>Clears all callbacks previously bound to the view with <code>delegateEvents</code>.
 You usually don&#39;t need to use this, but may wish to if you have multiple
-Backbone views attached to the same DOM element.
-</p>
+Backbone views attached to the same DOM element.</p>
 
             </div>
             
@@ -2792,40 +2624,16 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-132">
-            <div class="annotation">
-              
-              <div class="pilwrap ">
-                <a class="pilcrow" href="#section-132">&#182;</a>
-              </div>
-              <p>Performs the initial configuration of a View with a set of options.
-Keys with special meaning <em>(e.g. model, collection, id, className)</em> are
-attached directly to the view.  See <code>viewOptions</code> for an exhaustive
-list.
-</p>
-
-            </div>
-            
-            <div class="content"><div class='highlight'><pre>    _configure: <span class="keyword">function</span>(options) {
-      <span class="keyword">if</span> (<span class="keyword">this</span>.options) options = _.extend({}, _.result(<span class="keyword">this</span>, <span class="string">'options'</span>), options);
-      _.extend(<span class="keyword">this</span>, _.pick(options, viewOptions));
-      <span class="keyword">this</span>.options = options;
-    },</pre></div></div>
-            
-        </li>
-        
-        
-        <li id="section-133">
+        <li id="section-129">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-133">&#182;</a>
+                <a class="pilcrow" href="#section-129">&#182;</a>
               </div>
               <p>Ensure that the View has a DOM element to render into.
 If <code>this.el</code> is a string, pass it through <code>$()</code>, take the first
 matching element, and re-assign it to <code>el</code>. Otherwise, create
-an element from the <code>id</code>, <code>className</code> and <code>tagName</code> properties.
-</p>
+an element from the <code>id</code>, <code>className</code> and <code>tagName</code> properties.</p>
 
             </div>
             
@@ -2846,11 +2654,11 @@ <h2>Backbone.View</h2>
         </li>
         
         
-        <li id="section-134">
+        <li id="section-130">
             <div class="annotation">
               
               <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-134">&#182;</a>
+                <a class="pilcrow" href="#section-130">&#182;</a>
               </div>
               <h2>Backbone.sync</h2>
 
@@ -2859,18 +2667,16 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-135">
+        <li id="section-131">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-135">&#182;</a>
+                <a class="pilcrow" href="#section-131">&#182;</a>
               </div>
               <p>Override this function to change the manner in which Backbone persists
 models to the server. You will be passed the type of request, and the
 model in question. By default, makes a RESTful Ajax request
-to the model&#39;s <code>url()</code>. Some possible customizations could be:
-
-</p>
+to the model&#39;s <code>url()</code>. Some possible customizations could be:</p>
 <ul>
 <li>Use <code>setTimeout</code> to batch rapid-fire updates into a single request.</li>
 <li>Send up the models as XML instead of JSON.</li>
@@ -2881,8 +2687,7 @@ <h2>Backbone.sync</h2>
 as well as all requests with the body as <code>application/x-www-form-urlencoded</code>
 instead of <code>application/json</code> with the model in a param named <code>model</code>.
 Useful when interfacing with server-side languages like <strong>PHP</strong> that make
-it difficult to read the body of <code>PUT</code> requests.
-</p>
+it difficult to read the body of <code>PUT</code> requests.</p>
 
             </div>
             
@@ -2892,14 +2697,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-136">
+        <li id="section-132">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-136">&#182;</a>
+                <a class="pilcrow" href="#section-132">&#182;</a>
               </div>
-              <p>Default options, unless specified.
-</p>
+              <p>Default options, unless specified.</p>
 
             </div>
             
@@ -2911,14 +2715,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-137">
+        <li id="section-133">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-137">&#182;</a>
+                <a class="pilcrow" href="#section-133">&#182;</a>
               </div>
-              <p>Default JSON-request options.
-</p>
+              <p>Default JSON-request options.</p>
 
             </div>
             
@@ -2927,14 +2730,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-138">
+        <li id="section-134">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-138">&#182;</a>
+                <a class="pilcrow" href="#section-134">&#182;</a>
               </div>
-              <p>Ensure that we have a URL.
-</p>
+              <p>Ensure that we have a URL.</p>
 
             </div>
             
@@ -2945,14 +2747,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-139">
+        <li id="section-135">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-139">&#182;</a>
+                <a class="pilcrow" href="#section-135">&#182;</a>
               </div>
-              <p>Ensure that we have the appropriate request data.
-</p>
+              <p>Ensure that we have the appropriate request data.</p>
 
             </div>
             
@@ -2964,14 +2765,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-140">
+        <li id="section-136">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-140">&#182;</a>
+                <a class="pilcrow" href="#section-136">&#182;</a>
               </div>
-              <p>For older servers, emulate JSON by encoding the request into an HTML-form.
-</p>
+              <p>For older servers, emulate JSON by encoding the request into an HTML-form.</p>
 
             </div>
             
@@ -2983,15 +2783,14 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-141">
+        <li id="section-137">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-141">&#182;</a>
+                <a class="pilcrow" href="#section-137">&#182;</a>
               </div>
               <p>For older servers, emulate HTTP by mimicking the HTTP method with <code>_method</code>
-And an <code>X-HTTP-Method-Override</code> header.
-</p>
+And an <code>X-HTTP-Method-Override</code> header.</p>
 
             </div>
             
@@ -3008,14 +2807,13 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-142">
+        <li id="section-138">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-142">&#182;</a>
+                <a class="pilcrow" href="#section-138">&#182;</a>
               </div>
-              <p>Don&#39;t process data on a non-GET request.
-</p>
+              <p>Don&#39;t process data on a non-GET request.</p>
 
             </div>
             
@@ -3026,21 +2824,19 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-143">
+        <li id="section-139">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-143">&#182;</a>
+                <a class="pilcrow" href="#section-139">&#182;</a>
               </div>
               <p>If we&#39;re sending a <code>PATCH</code> request, and we&#39;re in an old Internet Explorer
 that still has ActiveX enabled by default, override jQuery to use that
-for XHR instead. Remove this line when jQuery supports <code>PATCH</code> on IE8.
-</p>
+for XHR instead. Remove this line when jQuery supports <code>PATCH</code> on IE8.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    <span class="keyword">if</span> (params.type === <span class="string">'PATCH'</span> &amp;&amp; window.ActiveXObject &amp;&amp;
-          !(window.external &amp;&amp; window.external.msActiveXFilteringEnabled)) {
+            <div class="content"><div class='highlight'><pre>    <span class="keyword">if</span> (params.type === <span class="string">'PATCH'</span> &amp;&amp; noXhrPatch) {
       params.xhr = <span class="keyword">function</span>() {
         <span class="keyword">return</span> <span class="keyword">new</span> ActiveXObject(<span class="string">"Microsoft.XMLHTTP"</span>);
       };
@@ -3049,33 +2845,33 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-144">
+        <li id="section-140">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-144">&#182;</a>
+                <a class="pilcrow" href="#section-140">&#182;</a>
               </div>
-              <p>Make the request, allowing the user to override any Ajax options.
-</p>
+              <p>Make the request, allowing the user to override any Ajax options.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    <span class="keyword">var</span> xhr = options.xhr = Backbone.ajax(_.extend(params, options));
     model.trigger(<span class="string">'request'</span>, model, xhr, options);
     <span class="keyword">return</span> xhr;
-  };</pre></div></div>
+  };
+
+  <span class="keyword">var</span> noXhrPatch = <span class="keyword">typeof</span> window !== <span class="string">'undefined'</span> &amp;&amp; !!window.ActiveXObject &amp;&amp; !(window.XMLHttpRequest &amp;&amp; (<span class="keyword">new</span> XMLHttpRequest).dispatchEvent);</pre></div></div>
             
         </li>
         
         
-        <li id="section-145">
+        <li id="section-141">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-145">&#182;</a>
+                <a class="pilcrow" href="#section-141">&#182;</a>
               </div>
-              <p>Map from CRUD to HTTP for our default <code>Backbone.sync</code> implementation.
-</p>
+              <p>Map from CRUD to HTTP for our default <code>Backbone.sync</code> implementation.</p>
 
             </div>
             
@@ -3090,15 +2886,14 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-146">
+        <li id="section-142">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-146">&#182;</a>
+                <a class="pilcrow" href="#section-142">&#182;</a>
               </div>
               <p>Set the default implementation of <code>Backbone.ajax</code> to proxy through to <code>$</code>.
-Override this if you&#39;d like to use a different library.
-</p>
+Override this if you&#39;d like to use a different library.</p>
 
             </div>
             
@@ -3109,11 +2904,11 @@ <h2>Backbone.sync</h2>
         </li>
         
         
-        <li id="section-147">
+        <li id="section-143">
             <div class="annotation">
               
               <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-147">&#182;</a>
+                <a class="pilcrow" href="#section-143">&#182;</a>
               </div>
               <h2>Backbone.Router</h2>
 
@@ -3122,15 +2917,14 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-148">
+        <li id="section-144">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-148">&#182;</a>
+                <a class="pilcrow" href="#section-144">&#182;</a>
               </div>
               <p>Routers map faux-URLs to actions, and fire events when routes are
-matched. Creating a new one sets its <code>routes</code> hash, if not set statically.
-</p>
+matched. Creating a new one sets its <code>routes</code> hash, if not set statically.</p>
 
             </div>
             
@@ -3144,15 +2938,14 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-149">
+        <li id="section-145">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-149">&#182;</a>
+                <a class="pilcrow" href="#section-145">&#182;</a>
               </div>
               <p>Cached regular expressions for matching named param parts and splatted
-parts of route strings.
-</p>
+parts of route strings.</p>
 
             </div>
             
@@ -3164,14 +2957,13 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-150">
+        <li id="section-146">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-150">&#182;</a>
+                <a class="pilcrow" href="#section-146">&#182;</a>
               </div>
-              <p>Set up all inheritable <strong>Backbone.Router</strong> properties and methods.
-</p>
+              <p>Set up all inheritable <strong>Backbone.Router</strong> properties and methods.</p>
 
             </div>
             
@@ -3180,15 +2972,14 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-151">
+        <li id="section-147">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-151">&#182;</a>
+                <a class="pilcrow" href="#section-147">&#182;</a>
               </div>
               <p>Initialize is an empty function by default. Override it with your own
-initialization logic.
-</p>
+initialization logic.</p>
 
             </div>
             
@@ -3197,15 +2988,13 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-152">
+        <li id="section-148">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-152">&#182;</a>
+                <a class="pilcrow" href="#section-148">&#182;</a>
               </div>
-              <p>Manually bind a single named route to a callback. For example:
-
-</p>
+              <p>Manually bind a single named route to a callback. For example:</p>
 <pre><code>this.route(&#39;search/:query/p:num&#39;, &#39;search&#39;, function(query, num) {
   ...
 });</code></pre>
@@ -3233,14 +3022,13 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-153">
+        <li id="section-149">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-153">&#182;</a>
+                <a class="pilcrow" href="#section-149">&#182;</a>
               </div>
-              <p>Simple proxy to <code>Backbone.history</code> to save a fragment into the history.
-</p>
+              <p>Simple proxy to <code>Backbone.history</code> to save a fragment into the history.</p>
 
             </div>
             
@@ -3252,16 +3040,15 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-154">
+        <li id="section-150">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-154">&#182;</a>
+                <a class="pilcrow" href="#section-150">&#182;</a>
               </div>
               <p>Bind all defined routes to <code>Backbone.history</code>. We have to reverse the
 order of the routes here to support behavior where the most general
-routes can be defined at the bottom of the route map.
-</p>
+routes can be defined at the bottom of the route map.</p>
 
             </div>
             
@@ -3277,22 +3064,21 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-155">
+        <li id="section-151">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-155">&#182;</a>
+                <a class="pilcrow" href="#section-151">&#182;</a>
               </div>
               <p>Convert a route string into a regular expression, suitable for matching
-against the current location hash.
-</p>
+against the current location hash.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    _routeToRegExp: <span class="keyword">function</span>(route) {
       route = route.replace(escapeRegExp, <span class="string">'\\$&amp;'</span>)
                    .replace(optionalParam, <span class="string">'(?:$1)?'</span>)
-                   .replace(namedParam, <span class="keyword">function</span>(match, optional){
+                   .replace(namedParam, <span class="keyword">function</span>(match, optional) {
                      <span class="keyword">return</span> optional ? match : <span class="string">'([^\/]+)'</span>;
                    })
                    .replace(splatParam, <span class="string">'(.*?)'</span>);
@@ -3302,16 +3088,15 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-156">
+        <li id="section-152">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-156">&#182;</a>
+                <a class="pilcrow" href="#section-152">&#182;</a>
               </div>
               <p>Given a route, and a URL fragment that it matches, return the array of
 extracted decoded parameters. Empty or unmatched parameters will be
-treated as <code>null</code> to normalize cross-browser behavior.
-</p>
+treated as <code>null</code> to normalize cross-browser behavior.</p>
 
             </div>
             
@@ -3327,11 +3112,11 @@ <h2>Backbone.Router</h2>
         </li>
         
         
-        <li id="section-157">
+        <li id="section-153">
             <div class="annotation">
               
               <div class="pilwrap for-h2">
-                <a class="pilcrow" href="#section-157">&#182;</a>
+                <a class="pilcrow" href="#section-153">&#182;</a>
               </div>
               <h2>Backbone.History</h2>
 
@@ -3340,18 +3125,17 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-158">
+        <li id="section-154">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-158">&#182;</a>
+                <a class="pilcrow" href="#section-154">&#182;</a>
               </div>
               <p>Handles cross-browser history management, based on either
 <a href="http://diveintohtml5.info/history.html">pushState</a> and real URLs, or
 <a href="https://developer.mozilla.org/en-US/docs/DOM/window.onhashchange">onhashchange</a>
 and URL fragments. If the browser supports neither (old IE, natch),
-falls back to polling.
-</p>
+falls back to polling.</p>
 
             </div>
             
@@ -3362,14 +3146,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-159">
+        <li id="section-155">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-159">&#182;</a>
+                <a class="pilcrow" href="#section-155">&#182;</a>
               </div>
-              <p>Ensure that <code>History</code> can be used outside of the browser.
-</p>
+              <p>Ensure that <code>History</code> can be used outside of the browser.</p>
 
             </div>
             
@@ -3382,14 +3165,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-160">
+        <li id="section-156">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-160">&#182;</a>
+                <a class="pilcrow" href="#section-156">&#182;</a>
               </div>
-              <p>Cached regex for stripping a leading hash/slash and trailing space.
-</p>
+              <p>Cached regex for stripping a leading hash/slash and trailing space.</p>
 
             </div>
             
@@ -3398,14 +3180,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-161">
+        <li id="section-157">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-161">&#182;</a>
+                <a class="pilcrow" href="#section-157">&#182;</a>
               </div>
-              <p>Cached regex for stripping leading and trailing slashes.
-</p>
+              <p>Cached regex for stripping leading and trailing slashes.</p>
 
             </div>
             
@@ -3414,14 +3195,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-162">
+        <li id="section-158">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-162">&#182;</a>
+                <a class="pilcrow" href="#section-158">&#182;</a>
               </div>
-              <p>Cached regex for detecting MSIE.
-</p>
+              <p>Cached regex for detecting MSIE.</p>
 
             </div>
             
@@ -3430,14 +3210,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-163">
+        <li id="section-159">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-163">&#182;</a>
+                <a class="pilcrow" href="#section-159">&#182;</a>
               </div>
-              <p>Cached regex for removing a trailing slash.
-</p>
+              <p>Cached regex for removing a trailing slash.</p>
 
             </div>
             
@@ -3446,14 +3225,28 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-164">
+        <li id="section-160">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-164">&#182;</a>
+                <a class="pilcrow" href="#section-160">&#182;</a>
               </div>
-              <p>Has the history handling already been started?
-</p>
+              <p>Cached regex for stripping urls of hash and query.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> pathStripper = <span class="regexp">/[?#].*$/</span>;</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-161">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-161">&#182;</a>
+              </div>
+              <p>Has the history handling already been started?</p>
 
             </div>
             
@@ -3462,14 +3255,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-165">
+        <li id="section-162">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-165">&#182;</a>
+                <a class="pilcrow" href="#section-162">&#182;</a>
               </div>
-              <p>Set up all inheritable <strong>Backbone.History</strong> properties and methods.
-</p>
+              <p>Set up all inheritable <strong>Backbone.History</strong> properties and methods.</p>
 
             </div>
             
@@ -3478,15 +3270,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-166">
+        <li id="section-163">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-166">&#182;</a>
+                <a class="pilcrow" href="#section-163">&#182;</a>
               </div>
               <p>The default interval to poll for hash changes, if necessary, is
-twenty times a second.
-</p>
+twenty times a second.</p>
 
             </div>
             
@@ -3495,15 +3286,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-167">
+        <li id="section-164">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-167">&#182;</a>
+                <a class="pilcrow" href="#section-164">&#182;</a>
               </div>
               <p>Gets the true hash value. Cannot use location.hash directly due to bug
-in Firefox where location.hash will always be decoded.
-</p>
+in Firefox where location.hash will always be decoded.</p>
 
             </div>
             
@@ -3515,15 +3305,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-168">
+        <li id="section-165">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-168">&#182;</a>
+                <a class="pilcrow" href="#section-165">&#182;</a>
               </div>
               <p>Get the cross-browser normalized URL fragment, either from the URL,
-the hash, or the override.
-</p>
+the hash, or the override.</p>
 
             </div>
             
@@ -3532,7 +3321,7 @@ <h2>Backbone.History</h2>
         <span class="keyword">if</span> (<span class="keyword">this</span>._hasPushState || !<span class="keyword">this</span>._wantsHashChange || forcePushState) {
           fragment = <span class="keyword">this</span>.location.pathname;
           <span class="keyword">var</span> root = <span class="keyword">this</span>.root.replace(trailingSlash, <span class="string">''</span>);
-          <span class="keyword">if</span> (!fragment.indexOf(root)) fragment = fragment.substr(root.length);
+          <span class="keyword">if</span> (!fragment.indexOf(root)) fragment = fragment.slice(root.length);
         } <span class="keyword">else</span> {
           fragment = <span class="keyword">this</span>.getHash();
         }
@@ -3543,15 +3332,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-169">
+        <li id="section-166">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-169">&#182;</a>
+                <a class="pilcrow" href="#section-166">&#182;</a>
               </div>
               <p>Start the hash change handling, returning <code>true</code> if the current URL matches
-an existing route, and <code>false</code> otherwise.
-</p>
+an existing route, and <code>false</code> otherwise.</p>
 
             </div>
             
@@ -3562,19 +3350,18 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-170">
+        <li id="section-167">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-170">&#182;</a>
+                <a class="pilcrow" href="#section-167">&#182;</a>
               </div>
               <p>Figure out the initial configuration. Do we need an iframe?
-Is pushState desired ... is it available?
-</p>
+Is pushState desired ... is it available?</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">this</span>.options          = _.extend({}, {root: <span class="string">'/'</span>}, <span class="keyword">this</span>.options, options);
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">this</span>.options          = _.extend({root: <span class="string">'/'</span>}, <span class="keyword">this</span>.options, options);
       <span class="keyword">this</span>.root             = <span class="keyword">this</span>.options.root;
       <span class="keyword">this</span>._wantsHashChange = <span class="keyword">this</span>.options.hashChange !== <span class="literal">false</span>;
       <span class="keyword">this</span>._wantsPushState  = !!<span class="keyword">this</span>.options.pushState;
@@ -3586,14 +3373,13 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-171">
+        <li id="section-168">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-171">&#182;</a>
+                <a class="pilcrow" href="#section-168">&#182;</a>
               </div>
-              <p>Normalize root to always include a leading and trailing slash.
-</p>
+              <p>Normalize root to always include a leading and trailing slash.</p>
 
             </div>
             
@@ -3607,15 +3393,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-172">
+        <li id="section-169">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-172">&#182;</a>
+                <a class="pilcrow" href="#section-169">&#182;</a>
               </div>
               <p>Depending on whether we&#39;re using pushState or hashes, and whether
-&#39;onhashchange&#39; is supported, determine how we check the URL state.
-</p>
+&#39;onhashchange&#39; is supported, determine how we check the URL state.</p>
 
             </div>
             
@@ -3630,15 +3415,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-173">
+        <li id="section-170">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-173">&#182;</a>
+                <a class="pilcrow" href="#section-170">&#182;</a>
               </div>
               <p>Determine if we need to change the base url, for a pushState link
-opened by a non-pushState browser.
-</p>
+opened by a non-pushState browser.</p>
 
             </div>
             
@@ -3649,56 +3433,71 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-174">
+        <li id="section-171">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-174">&#182;</a>
+                <a class="pilcrow" href="#section-171">&#182;</a>
               </div>
-              <p>If we&#39;ve started off with a route from a <code>pushState</code>-enabled browser,
-but we&#39;re currently in a browser that doesn&#39;t support it...
-</p>
+              <p>Transition from hashChange to pushState or vice versa if both are
+requested.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (<span class="keyword">this</span>._wantsHashChange &amp;&amp; <span class="keyword">this</span>._wantsPushState &amp;&amp; !<span class="keyword">this</span>._hasPushState &amp;&amp; !atRoot) {
-        <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getFragment(<span class="literal">null</span>, <span class="literal">true</span>);
-        <span class="keyword">this</span>.location.replace(<span class="keyword">this</span>.root + <span class="keyword">this</span>.location.search + <span class="string">'#'</span> + <span class="keyword">this</span>.fragment);</pre></div></div>
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (<span class="keyword">this</span>._wantsHashChange &amp;&amp; <span class="keyword">this</span>._wantsPushState) {</pre></div></div>
             
         </li>
         
         
-        <li id="section-175">
+        <li id="section-172">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-175">&#182;</a>
+                <a class="pilcrow" href="#section-172">&#182;</a>
               </div>
-              <p>Return immediately as browser will do redirect to new url
-</p>
+              <p>If we&#39;ve started off with a route from a <code>pushState</code>-enabled
+browser, but we&#39;re currently in a browser that doesn&#39;t support it...</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>        <span class="keyword">return</span> <span class="literal">true</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>        <span class="keyword">if</span> (!<span class="keyword">this</span>._hasPushState &amp;&amp; !atRoot) {
+          <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getFragment(<span class="literal">null</span>, <span class="literal">true</span>);
+          <span class="keyword">this</span>.location.replace(<span class="keyword">this</span>.root + <span class="keyword">this</span>.location.search + <span class="string">'#'</span> + <span class="keyword">this</span>.fragment);</pre></div></div>
             
         </li>
         
         
-        <li id="section-176">
+        <li id="section-173">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-176">&#182;</a>
+                <a class="pilcrow" href="#section-173">&#182;</a>
+              </div>
+              <p>Return immediately as browser will do redirect to new url</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>          <span class="keyword">return</span> <span class="literal">true</span>;</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-174">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-174">&#182;</a>
               </div>
               <p>Or if we&#39;ve started out with a hash-based route, but we&#39;re currently
-in a browser where it could be <code>pushState</code>-based instead...
-</p>
+in a browser where it could be <code>pushState</code>-based instead...</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>      } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="keyword">this</span>._wantsPushState &amp;&amp; <span class="keyword">this</span>._hasPushState &amp;&amp; atRoot &amp;&amp; loc.hash) {
-        <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getHash().replace(routeStripper, <span class="string">''</span>);
-        <span class="keyword">this</span>.history.replaceState({}, document.title, <span class="keyword">this</span>.root + <span class="keyword">this</span>.fragment + loc.search);
+            <div class="content"><div class='highlight'><pre>        } <span class="keyword">else</span> <span class="keyword">if</span> (<span class="keyword">this</span>._hasPushState &amp;&amp; atRoot &amp;&amp; loc.hash) {
+          <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getHash().replace(routeStripper, <span class="string">''</span>);
+          <span class="keyword">this</span>.history.replaceState({}, document.title, <span class="keyword">this</span>.root + <span class="keyword">this</span>.fragment + loc.search);
+        }
+
       }
 
       <span class="keyword">if</span> (!<span class="keyword">this</span>.options.silent) <span class="keyword">return</span> <span class="keyword">this</span>.loadUrl();
@@ -3707,15 +3506,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-177">
+        <li id="section-175">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-177">&#182;</a>
+                <a class="pilcrow" href="#section-175">&#182;</a>
               </div>
               <p>Disable Backbone.history, perhaps temporarily. Not useful in a real app,
-but possibly useful for unit testing Routers.
-</p>
+but possibly useful for unit testing Routers.</p>
 
             </div>
             
@@ -3728,15 +3526,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-178">
+        <li id="section-176">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-178">&#182;</a>
+                <a class="pilcrow" href="#section-176">&#182;</a>
               </div>
               <p>Add a route to be tested when the fragment changes. Routes added later
-may override previous routes.
-</p>
+may override previous routes.</p>
 
             </div>
             
@@ -3747,15 +3544,14 @@ <h2>Backbone.History</h2>
         </li>
         
         
-        <li id="section-179">
+        <li id="section-177">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-179">&#182;</a>
+                <a class="pilcrow" href="#section-177">&#182;</a>
               </div>
               <p>Checks the current URL to see if it has changed, and if it has,
-calls <code>loadUrl</code>, normalizing across the hidden iframe.
-</p>
+calls <code>loadUrl</code>, normalizing across the hidden iframe.</p>
 
             </div>
             
@@ -3766,64 +3562,90 @@ <h2>Backbone.History</h2>
       }
       <span class="keyword">if</span> (current === <span class="keyword">this</span>.fragment) <span class="keyword">return</span> <span class="literal">false</span>;
       <span class="keyword">if</span> (<span class="keyword">this</span>.iframe) <span class="keyword">this</span>.navigate(current);
-      <span class="keyword">this</span>.loadUrl() || <span class="keyword">this</span>.loadUrl(<span class="keyword">this</span>.getHash());
+      <span class="keyword">this</span>.loadUrl();
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-180">
+        <li id="section-178">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-180">&#182;</a>
+                <a class="pilcrow" href="#section-178">&#182;</a>
               </div>
               <p>Attempt to load the current URL fragment. If a route succeeds with a
 match, returns <code>true</code>. If no defined routes matches the fragment,
-returns <code>false</code>.
-</p>
+returns <code>false</code>.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>    loadUrl: <span class="keyword">function</span>(fragmentOverride) {
-      <span class="keyword">var</span> fragment = <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getFragment(fragmentOverride);
-      <span class="keyword">var</span> matched = _.any(<span class="keyword">this</span>.handlers, <span class="keyword">function</span>(handler) {
+            <div class="content"><div class='highlight'><pre>    loadUrl: <span class="keyword">function</span>(fragment) {
+      fragment = <span class="keyword">this</span>.fragment = <span class="keyword">this</span>.getFragment(fragment);
+      <span class="keyword">return</span> _.any(<span class="keyword">this</span>.handlers, <span class="keyword">function</span>(handler) {
         <span class="keyword">if</span> (handler.route.test(fragment)) {
           handler.callback(fragment);
           <span class="keyword">return</span> <span class="literal">true</span>;
         }
       });
-      <span class="keyword">return</span> matched;
     },</pre></div></div>
             
         </li>
         
         
-        <li id="section-181">
+        <li id="section-179">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-181">&#182;</a>
+                <a class="pilcrow" href="#section-179">&#182;</a>
               </div>
               <p>Save a fragment into the hash history, or replace the URL state if the
 &#39;replace&#39; option is passed. You are responsible for properly URL-encoding
-the fragment in advance.
-
-</p>
+the fragment in advance.</p>
 <p>The options object can contain <code>trigger: true</code> if you wish to have the
 route callback be fired (not usually desirable), or <code>replace: true</code>, if
-you wish to modify the current URL without adding an entry to the history.
-</p>
+you wish to modify the current URL without adding an entry to the history.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    navigate: <span class="keyword">function</span>(fragment, options) {
       <span class="keyword">if</span> (!History.started) <span class="keyword">return</span> <span class="literal">false</span>;
-      <span class="keyword">if</span> (!options || options === <span class="literal">true</span>) options = {trigger: options};
-      fragment = <span class="keyword">this</span>.getFragment(fragment || <span class="string">''</span>);
+      <span class="keyword">if</span> (!options || options === <span class="literal">true</span>) options = {trigger: !!options};
+
+      <span class="keyword">var</span> url = <span class="keyword">this</span>.root + (fragment = <span class="keyword">this</span>.getFragment(fragment || <span class="string">''</span>));</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-180">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-180">&#182;</a>
+              </div>
+              <p>Strip the fragment of the query and hash for matching.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      fragment = fragment.replace(pathStripper, <span class="string">''</span>);
+
       <span class="keyword">if</span> (<span class="keyword">this</span>.fragment === fragment) <span class="keyword">return</span>;
-      <span class="keyword">this</span>.fragment = fragment;
-      <span class="keyword">var</span> url = <span class="keyword">this</span>.root + fragment;</pre></div></div>
+      <span class="keyword">this</span>.fragment = fragment;</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-181">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-181">&#182;</a>
+              </div>
+              <p>Don&#39;t include a trailing slash on the root.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>      <span class="keyword">if</span> (fragment === <span class="string">''</span> &amp;&amp; url !== <span class="string">'/'</span>) url = url.slice(<span class="number">0</span>, -<span class="number">1</span>);</pre></div></div>
             
         </li>
         
@@ -3834,8 +3656,7 @@ <h2>Backbone.History</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-182">&#182;</a>
               </div>
-              <p>If pushState is available, we use it to set the fragment as a real URL.
-</p>
+              <p>If pushState is available, we use it to set the fragment as a real URL.</p>
 
             </div>
             
@@ -3852,8 +3673,7 @@ <h2>Backbone.History</h2>
                 <a class="pilcrow" href="#section-183">&#182;</a>
               </div>
               <p>If hash changes haven&#39;t been explicitly disabled, update the hash
-fragment to store history.
-</p>
+fragment to store history.</p>
 
             </div>
             
@@ -3872,8 +3692,7 @@ <h2>Backbone.History</h2>
               </div>
               <p>Opening and closing the iframe tricks IE7 and earlier to push a
 history entry on hash-tag change.  When replace is true, we don&#39;t
-want this.
-</p>
+want this.</p>
 
             </div>
             
@@ -3891,15 +3710,14 @@ <h2>Backbone.History</h2>
                 <a class="pilcrow" href="#section-185">&#182;</a>
               </div>
               <p>If you&#39;ve told us that you explicitly don&#39;t want fallback hashchange-
-based history, then <code>navigate</code> becomes a page refresh.
-</p>
+based history, then <code>navigate</code> becomes a page refresh.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>      } <span class="keyword">else</span> {
         <span class="keyword">return</span> <span class="keyword">this</span>.location.assign(url);
       }
-      <span class="keyword">if</span> (options.trigger) <span class="keyword">this</span>.loadUrl(fragment);
+      <span class="keyword">if</span> (options.trigger) <span class="keyword">return</span> <span class="keyword">this</span>.loadUrl(fragment);
     },</pre></div></div>
             
         </li>
@@ -3912,8 +3730,7 @@ <h2>Backbone.History</h2>
                 <a class="pilcrow" href="#section-186">&#182;</a>
               </div>
               <p>Update the hash location, either replacing the current entry, or adding
-a new one to the browser history.
-</p>
+a new one to the browser history.</p>
 
             </div>
             
@@ -3932,8 +3749,7 @@ <h2>Backbone.History</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-187">&#182;</a>
               </div>
-              <p>Some browsers require that <code>hash</code> contains a leading #.
-</p>
+              <p>Some browsers require that <code>hash</code> contains a leading #.</p>
 
             </div>
             
@@ -3952,8 +3768,7 @@ <h2>Backbone.History</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-188">&#182;</a>
               </div>
-              <p>Create the default Backbone.history.
-</p>
+              <p>Create the default Backbone.history.</p>
 
             </div>
             
@@ -3983,8 +3798,7 @@ <h2>Helpers</h2>
               </div>
               <p>Helper function to correctly set up the prototype chain, for subclasses.
 Similar to <code>goog.inherits</code>, but uses a hash of prototype properties and
-class properties to be extended.
-</p>
+class properties to be extended.</p>
 
             </div>
             
@@ -4003,8 +3817,7 @@ <h2>Helpers</h2>
               </div>
               <p>The constructor function for the new subclass is either defined by you
 (the &quot;constructor&quot; property in your <code>extend</code> definition), or defaulted
-by us to simply call the parent&#39;s constructor.
-</p>
+by us to simply call the parent&#39;s constructor.</p>
 
             </div>
             
@@ -4023,8 +3836,7 @@ <h2>Helpers</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-192">&#182;</a>
               </div>
-              <p>Add static properties to the constructor function, if supplied.
-</p>
+              <p>Add static properties to the constructor function, if supplied.</p>
 
             </div>
             
@@ -4040,8 +3852,7 @@ <h2>Helpers</h2>
                 <a class="pilcrow" href="#section-193">&#182;</a>
               </div>
               <p>Set the prototype chain to inherit from <code>parent</code>, without calling
-<code>parent</code>&#39;s constructor function.
-</p>
+<code>parent</code>&#39;s constructor function.</p>
 
             </div>
             
@@ -4059,8 +3870,7 @@ <h2>Helpers</h2>
                 <a class="pilcrow" href="#section-194">&#182;</a>
               </div>
               <p>Add prototype properties (instance properties) to the subclass,
-if supplied.
-</p>
+if supplied.</p>
 
             </div>
             
@@ -4076,8 +3886,7 @@ <h2>Helpers</h2>
                 <a class="pilcrow" href="#section-195">&#182;</a>
               </div>
               <p>Set a convenience property in case the parent&#39;s prototype is needed
-later.
-</p>
+later.</p>
 
             </div>
             
@@ -4095,8 +3904,7 @@ <h2>Helpers</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-196">&#182;</a>
               </div>
-              <p>Set up inheritance for the model, collection, router, view and history.
-</p>
+              <p>Set up inheritance for the model, collection, router, view and history.</p>
 
             </div>
             
@@ -4111,8 +3919,7 @@ <h2>Helpers</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-197">&#182;</a>
               </div>
-              <p>Throw an error when a URL is needed, and none is supplied.
-</p>
+              <p>Throw an error when a URL is needed, and none is supplied.</p>
 
             </div>
             
@@ -4129,12 +3936,11 @@ <h2>Helpers</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-198">&#182;</a>
               </div>
-              <p>Wrap an optional error callback with a fallback error event.
-</p>
+              <p>Wrap an optional error callback with a fallback error event.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> wrapError = <span class="function"><span class="keyword">function</span> <span class="params">(model, options)</span> {</span>
+            <div class="content"><div class='highlight'><pre>  <span class="keyword">var</span> wrapError = <span class="keyword">function</span>(model, options) {
     <span class="keyword">var</span> error = options.error;
     options.error = <span class="keyword">function</span>(resp) {
       <span class="keyword">if</span> (error) error(model, resp, options);
diff --git a/bower_components/backbone/docs/backbone.localstorage.html b/bower_components/backbone/docs/backbone.localstorage.html
index ed34b793..214d61b9 100644
--- a/bower_components/backbone/docs/backbone.localstorage.html
+++ b/bower_components/backbone/docs/backbone.localstorage.html
@@ -69,8 +69,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <p>AMD. Register as an anonymous module.
-</p>
+              <p>AMD. Register as an anonymous module.</p>
 
             </div>
             
@@ -85,8 +84,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Use global variables if the locals are undefined.
-</p>
+              <p>Use global variables if the locals are undefined.</p>
 
             </div>
             
@@ -103,8 +101,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>RequireJS isn&#39;t being used. Assume underscore and backbone are loaded in <script> tags
-</p>
+              <p>RequireJS isn&#39;t being used. Assume underscore and backbone are loaded in <script> tags</p>
 
             </div>
             
@@ -123,15 +120,10 @@ <h1>backbone.localstorage.js</h1>
               </div>
               <p>A simple module to replace <code>Backbone.sync</code> with <em>localStorage</em>-based
 persistence. Models are given GUIDS, and saved into a JSON object. Simple
-as that.
-
-</p>
+as that.</p>
 <p>Hold reference to Underscore.js and Backbone.js in the closure in order
-to make things work even if they are removed from the global namespace
-
-</p>
-<p>Generate four random hex digits.
-</p>
+to make things work even if they are removed from the global namespace</p>
+<p>Generate four random hex digits.</p>
 
             </div>
             
@@ -148,8 +140,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
-              <p>Generate a pseudo-GUID by concatenating random hexadecimal.
-</p>
+              <p>Generate a pseudo-GUID by concatenating random hexadecimal.</p>
 
             </div>
             
@@ -168,8 +159,7 @@ <h1>backbone.localstorage.js</h1>
               </div>
               <p>Our Store is represented by a single JS object in <em>localStorage</em>. Create it
 with a meaningful name, like the name you&#39;d give a table.
-window.Store is deprectated, use Backbone.LocalStorage instead
-</p>
+window.Store is deprectated, use Backbone.LocalStorage instead</p>
 
             </div>
             
@@ -190,8 +180,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Save the current state of the <strong>Store</strong> to <em>localStorage</em>.
-</p>
+              <p>Save the current state of the <strong>Store</strong> to <em>localStorage</em>.</p>
 
             </div>
             
@@ -209,8 +198,7 @@ <h1>backbone.localstorage.js</h1>
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
               <p>Add a model, giving it a (hopefully)-unique GUID, if it doesn&#39;t already
-have an id of it&#39;s own.
-</p>
+have an id of it&#39;s own.</p>
 
             </div>
             
@@ -234,8 +222,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Update a model by replacing its copy in <code>this.data</code>.
-</p>
+              <p>Update a model by replacing its copy in <code>this.data</code>.</p>
 
             </div>
             
@@ -255,8 +242,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>Retrieve a model from <code>this.data</code> by id.
-</p>
+              <p>Retrieve a model from <code>this.data</code> by id.</p>
 
             </div>
             
@@ -273,8 +259,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
-              <p>Return the array of all models currently in storage.
-</p>
+              <p>Return the array of all models currently in storage.</p>
 
             </div>
             
@@ -296,8 +281,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Delete a model from <code>this.data</code>, returning it.
-</p>
+              <p>Delete a model from <code>this.data</code>, returning it.</p>
 
             </div>
             
@@ -325,8 +309,7 @@ <h1>backbone.localstorage.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>fix for &quot;illegal access&quot; error on Android when JSON.parse is passed null
-</p>
+              <p>fix for &quot;illegal access&quot; error on Android when JSON.parse is passed null</p>
 
             </div>
             
@@ -347,8 +330,7 @@ <h1>backbone.localstorage.js</h1>
               </div>
               <p>localSync delegate to the model or collection&#39;s
 <em>localStorage</em> property, which should be an instance of <code>Store</code>.
-window.Store.sync and Backbone.localSync is deprectated, use Backbone.LocalStorage.sync instead
-</p>
+window.Store.sync and Backbone.localSync is deprectated, use Backbone.LocalStorage.sync instead</p>
 
             </div>
             
@@ -408,8 +390,7 @@ <h1>backbone.localstorage.js</h1>
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
               <p>add compatibility with $.ajax
-always execute callback for success and error
-</p>
+always execute callback for success and error</p>
 
             </div>
             
@@ -438,8 +419,7 @@ <h1>backbone.localstorage.js</h1>
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
               <p>Override &#39;Backbone.sync&#39; to default to localSync,
-the original &#39;Backbone.sync&#39; is still available in &#39;Backbone.ajaxSync&#39;
-</p>
+the original &#39;Backbone.sync&#39; is still available in &#39;Backbone.ajaxSync&#39;</p>
 
             </div>
             
diff --git a/bower_components/backbone/docs/docco.css b/bower_components/backbone/docs/docco.css
index 6eedee3e..f690a079 100644
--- a/bower_components/backbone/docs/docco.css
+++ b/bower_components/backbone/docs/docco.css
@@ -51,17 +51,9 @@ b, strong {
   font-family: "aller-bold";
 }
 
-p {
+p, ul, ol {
   margin: 15px 0 0px;
 }
-  .annotation ul, .annotation ol {
-    margin: 25px 0;
-  }
-    .annotation ul li, .annotation ol li {
-      font-size: 14px;
-      line-height: 18px;
-      margin: 10px 0;
-    }
 
 h1, h2, h3, h4, h5, h6 {
   color: #112233;
diff --git a/bower_components/backbone/docs/images/battlefield.png b/bower_components/backbone/docs/images/battlefield.png
deleted file mode 100644
index dd649d44..00000000
Binary files a/bower_components/backbone/docs/images/battlefield.png and /dev/null differ
diff --git a/bower_components/backbone/docs/images/favicon.ico b/bower_components/backbone/docs/images/favicon.ico
index 2624a642..7f7d9504 100644
Binary files a/bower_components/backbone/docs/images/favicon.ico and b/bower_components/backbone/docs/images/favicon.ico differ
diff --git a/bower_components/backbone/docs/images/gawker.png b/bower_components/backbone/docs/images/gawker.png
new file mode 100644
index 00000000..84f6e086
Binary files /dev/null and b/bower_components/backbone/docs/images/gawker.png differ
diff --git a/bower_components/backbone/docs/images/lens.png b/bower_components/backbone/docs/images/lens.png
new file mode 100644
index 00000000..63a9c9ef
Binary files /dev/null and b/bower_components/backbone/docs/images/lens.png differ
diff --git a/bower_components/backbone/docs/images/linkedin-mobile.png b/bower_components/backbone/docs/images/linkedin-mobile.png
deleted file mode 100644
index d6bb0542..00000000
Binary files a/bower_components/backbone/docs/images/linkedin-mobile.png and /dev/null differ
diff --git a/bower_components/backbone/docs/images/prose.png b/bower_components/backbone/docs/images/prose.png
deleted file mode 100644
index c979d6f7..00000000
Binary files a/bower_components/backbone/docs/images/prose.png and /dev/null differ
diff --git a/bower_components/backbone/docs/images/zocdoc.jpg b/bower_components/backbone/docs/images/zocdoc.jpg
new file mode 100644
index 00000000..3783d193
Binary files /dev/null and b/bower_components/backbone/docs/images/zocdoc.jpg differ
diff --git a/bower_components/backbone/docs/todos.html b/bower_components/backbone/docs/todos.html
index 931a8ca0..b18c8913 100644
--- a/bower_components/backbone/docs/todos.html
+++ b/bower_components/backbone/docs/todos.html
@@ -51,11 +51,8 @@ <h1>todos.js</h1>
               <p>An example Backbone application contributed by
 <a href="http://jgn.me/">Jérôme Gravel-Niquet</a>. This demo uses a simple
 <a href="backbone-localstorage.html">LocalStorage adapter</a>
-to persist Backbone models within your browser.
-
-</p>
-<p>Load the application once the DOM is ready, using <code>jQuery.ready</code>:
-</p>
+to persist Backbone models within your browser.</p>
+<p>Load the application once the DOM is ready, using <code>jQuery.ready</code>:</p>
 
             </div>
             
@@ -83,8 +80,7 @@ <h2>Todo Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
-              <p>Our basic <strong>Todo</strong> model has <code>title</code>, <code>order</code>, and <code>done</code> attributes.
-</p>
+              <p>Our basic <strong>Todo</strong> model has <code>title</code>, <code>order</code>, and <code>done</code> attributes.</p>
 
             </div>
             
@@ -99,8 +95,7 @@ <h2>Todo Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Default attributes for the todo item.
-</p>
+              <p>Default attributes for the todo item.</p>
 
             </div>
             
@@ -121,8 +116,7 @@ <h2>Todo Model</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
-              <p>Toggle the <code>done</code> state of this todo item.
-</p>
+              <p>Toggle the <code>done</code> state of this todo item.</p>
 
             </div>
             
@@ -155,8 +149,7 @@ <h2>Todo Collection</h2>
                 <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
               <p>The collection of todos is backed by <em>localStorage</em> instead of a remote
-server.
-</p>
+server.</p>
 
             </div>
             
@@ -171,8 +164,7 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Reference to this collection&#39;s model.
-</p>
+              <p>Reference to this collection&#39;s model.</p>
 
             </div>
             
@@ -187,8 +179,7 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-9">&#182;</a>
               </div>
-              <p>Save all of the todo items under the <code>&quot;todos-backbone&quot;</code> namespace.
-</p>
+              <p>Save all of the todo items under the <code>&quot;todos-backbone&quot;</code> namespace.</p>
 
             </div>
             
@@ -203,8 +194,7 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-10">&#182;</a>
               </div>
-              <p>Filter down the list of all todo items that are finished.
-</p>
+              <p>Filter down the list of all todo items that are finished.</p>
 
             </div>
             
@@ -221,13 +211,12 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-11">&#182;</a>
               </div>
-              <p>Filter down the list to only todo items that are still not finished.
-</p>
+              <p>Filter down the list to only todo items that are still not finished.</p>
 
             </div>
             
             <div class="content"><div class='highlight'><pre>    remaining: <span class="keyword">function</span>() {
-      <span class="keyword">return</span> <span class="keyword">this</span>.without.apply(<span class="keyword">this</span>, <span class="keyword">this</span>.done());
+      <span class="keyword">return</span> <span class="keyword">this</span>.where({done: <span class="literal">false</span>});
     },</pre></div></div>
             
         </li>
@@ -240,8 +229,7 @@ <h2>Todo Collection</h2>
                 <a class="pilcrow" href="#section-12">&#182;</a>
               </div>
               <p>We keep the Todos in sequential order, despite being saved by unordered
-GUID in the database. This generates the next order number for new items.
-</p>
+GUID in the database. This generates the next order number for new items.</p>
 
             </div>
             
@@ -259,8 +247,7 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-13">&#182;</a>
               </div>
-              <p>Todos are sorted by their original insertion order.
-</p>
+              <p>Todos are sorted by their original insertion order.</p>
 
             </div>
             
@@ -277,8 +264,7 @@ <h2>Todo Collection</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-14">&#182;</a>
               </div>
-              <p>Create our global collection of <strong>Todos</strong>.
-</p>
+              <p>Create our global collection of <strong>Todos</strong>.</p>
 
             </div>
             
@@ -306,8 +292,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-16">&#182;</a>
               </div>
-              <p>The DOM element for a todo item...
-</p>
+              <p>The DOM element for a todo item...</p>
 
             </div>
             
@@ -322,8 +307,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-17">&#182;</a>
               </div>
-              <p>... is a list tag.
-</p>
+              <p>... is a list tag.</p>
 
             </div>
             
@@ -338,8 +322,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-18">&#182;</a>
               </div>
-              <p>Cache the template function for a single item.
-</p>
+              <p>Cache the template function for a single item.</p>
 
             </div>
             
@@ -354,8 +337,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-19">&#182;</a>
               </div>
-              <p>The DOM events specific to an item.
-</p>
+              <p>The DOM events specific to an item.</p>
 
             </div>
             
@@ -378,8 +360,7 @@ <h2>Todo Item View</h2>
               </div>
               <p>The TodoView listens for changes to its model, re-rendering. Since there&#39;s
 a one-to-one correspondence between a <strong>Todo</strong> and a <strong>TodoView</strong> in this
-app, we set a direct reference on the model for convenience.
-</p>
+app, we set a direct reference on the model for convenience.</p>
 
             </div>
             
@@ -397,8 +378,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-21">&#182;</a>
               </div>
-              <p>Re-render the titles of the todo item.
-</p>
+              <p>Re-render the titles of the todo item.</p>
 
             </div>
             
@@ -418,8 +398,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-22">&#182;</a>
               </div>
-              <p>Toggle the <code>&quot;done&quot;</code> state of the model.
-</p>
+              <p>Toggle the <code>&quot;done&quot;</code> state of the model.</p>
 
             </div>
             
@@ -436,8 +415,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-23">&#182;</a>
               </div>
-              <p>Switch this view into <code>&quot;editing&quot;</code> mode, displaying the input field.
-</p>
+              <p>Switch this view into <code>&quot;editing&quot;</code> mode, displaying the input field.</p>
 
             </div>
             
@@ -455,8 +433,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-24">&#182;</a>
               </div>
-              <p>Close the <code>&quot;editing&quot;</code> mode, saving changes to the todo.
-</p>
+              <p>Close the <code>&quot;editing&quot;</code> mode, saving changes to the todo.</p>
 
             </div>
             
@@ -479,8 +456,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-25">&#182;</a>
               </div>
-              <p>If you hit <code>enter</code>, we&#39;re through editing the item.
-</p>
+              <p>If you hit <code>enter</code>, we&#39;re through editing the item.</p>
 
             </div>
             
@@ -497,8 +473,7 @@ <h2>Todo Item View</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-26">&#182;</a>
               </div>
-              <p>Remove the item, destroy the model.
-</p>
+              <p>Remove the item, destroy the model.</p>
 
             </div>
             
@@ -530,8 +505,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-28">&#182;</a>
               </div>
-              <p>Our overall <strong>AppView</strong> is the top-level piece of UI.
-</p>
+              <p>Our overall <strong>AppView</strong> is the top-level piece of UI.</p>
 
             </div>
             
@@ -547,8 +521,7 @@ <h2>The Application</h2>
                 <a class="pilcrow" href="#section-29">&#182;</a>
               </div>
               <p>Instead of generating a new element, bind to the existing skeleton of
-the App already present in the HTML.
-</p>
+the App already present in the HTML.</p>
 
             </div>
             
@@ -563,8 +536,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-30">&#182;</a>
               </div>
-              <p>Our template for the line of statistics at the bottom of the app.
-</p>
+              <p>Our template for the line of statistics at the bottom of the app.</p>
 
             </div>
             
@@ -579,8 +551,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-31">&#182;</a>
               </div>
-              <p>Delegated events for creating new items, and clearing completed ones.
-</p>
+              <p>Delegated events for creating new items, and clearing completed ones.</p>
 
             </div>
             
@@ -601,8 +572,7 @@ <h2>The Application</h2>
               </div>
               <p>At initialization we bind to the relevant events on the <code>Todos</code>
 collection, when items are added or changed. Kick things off by
-loading any preexisting todos that might be saved in <em>localStorage</em>.
-</p>
+loading any preexisting todos that might be saved in <em>localStorage</em>.</p>
 
             </div>
             
@@ -631,8 +601,7 @@ <h2>The Application</h2>
                 <a class="pilcrow" href="#section-33">&#182;</a>
               </div>
               <p>Re-rendering the App just means refreshing the statistics -- the rest
-of the app doesn&#39;t change.
-</p>
+of the app doesn&#39;t change.</p>
 
             </div>
             
@@ -662,8 +631,7 @@ <h2>The Application</h2>
                 <a class="pilcrow" href="#section-34">&#182;</a>
               </div>
               <p>Add a single todo item to the list by creating a view for it, and
-appending its element to the <code>&lt;ul&gt;</code>.
-</p>
+appending its element to the <code>&lt;ul&gt;</code>.</p>
 
             </div>
             
@@ -681,8 +649,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-35">&#182;</a>
               </div>
-              <p>Add all items in the <strong>Todos</strong> collection at once.
-</p>
+              <p>Add all items in the <strong>Todos</strong> collection at once.</p>
 
             </div>
             
@@ -700,8 +667,7 @@ <h2>The Application</h2>
                 <a class="pilcrow" href="#section-36">&#182;</a>
               </div>
               <p>If you hit return in the main input field, create new <strong>Todo</strong> model,
-persisting it to <em>localStorage</em>.
-</p>
+persisting it to <em>localStorage</em>.</p>
 
             </div>
             
@@ -722,8 +688,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-37">&#182;</a>
               </div>
-              <p>Clear all done todo items, destroying their models.
-</p>
+              <p>Clear all done todo items, destroying their models.</p>
 
             </div>
             
@@ -748,8 +713,7 @@ <h2>The Application</h2>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-38">&#182;</a>
               </div>
-              <p>Finally, we kick things off by creating the <strong>App</strong>.
-</p>
+              <p>Finally, we kick things off by creating the <strong>App</strong>.</p>
 
             </div>
             
diff --git a/bower_components/backbone/examples/todos/todos.js b/bower_components/backbone/examples/todos/todos.js
index fc07c285..66d6282e 100644
--- a/bower_components/backbone/examples/todos/todos.js
+++ b/bower_components/backbone/examples/todos/todos.js
@@ -48,7 +48,7 @@ $(function(){
 
     // Filter down the list to only todo items that are still not finished.
     remaining: function() {
-      return this.without.apply(this, this.done());
+      return this.where({done: false});
     },
 
     // We keep the Todos in sequential order, despite being saved by unordered
diff --git a/bower_components/backbone/index.html b/bower_components/backbone/index.html
index 086792b8..252de59d 100644
--- a/bower_components/backbone/index.html
+++ b/bower_components/backbone/index.html
@@ -286,10 +286,10 @@
   <div id="sidebar" class="interface">
 
     <a class="toc_title" href="#">
-      Backbone.js <span class="version">(1.0.0)</span>
+      Backbone.js <span class="version">(1.1.0)</span>
     </a>
     <ul class="toc_section">
-      <li>&raquo; <a href="http://github.com/documentcloud/backbone">GitHub Repository</a></li>
+      <li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
       <li>&raquo; <a href="docs/backbone.html">Annotated Source</a></li>
     </ul>
 
@@ -427,6 +427,7 @@
       <li>– <a href="#View-setElement">setElement</a></li>
       <li>– <a href="#View-attributes">attributes</a></li>
       <li>– <a href="#View-dollar">$ (jQuery)</a></li>
+      <li>– <a href="#View-template">template</a></li>
       <li>– <a href="#View-render">render</a></li>
       <li>– <a href="#View-remove">remove</a></li>
       <li>– <a href="#View-delegateEvents">delegateEvents</a></li>
@@ -449,9 +450,9 @@
       <li>– <a href="#examples-documentcloud">DocumentCloud</a></li>
       <li>– <a href="#examples-usa-today">USA Today</a></li>
       <li>– <a href="#examples-rdio">Rdio</a></li>
-      <li>– <a href="#examples-linkedin">LinkedIn Mobile</a></li>
       <li>– <a href="#examples-hulu">Hulu</a></li>
       <li>– <a href="#examples-quartz">Quartz</a></li>
+      <li>– <a href="#examples-gawker">Gawker Media</a></li>
       <li>– <a href="#examples-flow">Flow</a></li>
       <li>– <a href="#examples-gilt">Gilt Groupe</a></li>
       <li>– <a href="#examples-newsblur">NewsBlur</a></li>
@@ -460,10 +461,12 @@
       <li>– <a href="#examples-bitbucket">Bitbucket</a></li>
       <li>– <a href="#examples-disqus">Disqus</a></li>
       <li>– <a href="#examples-khan-academy">Khan Academy</a></li>
+      <li>– <a href="#examples-elife-lens">eLife Lens</a></li>
       <li>– <a href="#examples-do">Do</a></li>
       <li>– <a href="#examples-irccloud">IRCCloud</a></li>
       <li>– <a href="#examples-pitchfork">Pitchfork</a></li>
       <li>– <a href="#examples-spin">Spin</a></li>
+      <li>– <a href="#examples-zocdoc">ZocDoc</a></li>
       <li>– <a href="#examples-walmart">Walmart Mobile</a></li>
       <li>– <a href="#examples-groupon">Groupon Now!</a></li>
       <li>– <a href="#examples-basecamp">Basecamp</a></li>
@@ -479,9 +482,7 @@
       <li>– <a href="#examples-cloudapp">CloudApp</a></li>
       <li>– <a href="#examples-seatgeek">SeatGeek</a></li>
       <li>– <a href="#examples-easel">Easel</a></li>
-      <li>– <a href="#examples-prose">Prose</a></li>
       <li>- <a href="#examples-jolicloud">Jolicloud</a></li>
-      <li>– <a href="#examples-battlefield">Battlefield Play4Free</a></li>
       <li>– <a href="#examples-syllabus">Syllabus</a></li>
       <li>– <a href="#examples-salon">Salon.io</a></li>
       <li>– <a href="#examples-tilemill">TileMill</a></li>
@@ -525,21 +526,21 @@
     </p>
 
     <p>
-      The project is <a href="http://github.com/documentcloud/backbone/">hosted on GitHub</a>,
+      The project is <a href="http://github.com/jashkenas/backbone/">hosted on GitHub</a>,
       and the <a href="docs/backbone.html">annotated source code</a> is available,
       as well as an online <a href="test/">test suite</a>,
       an <a href="examples/todos/index.html">example application</a>,
-      a <a href="https://github.com/documentcloud/backbone/wiki/Tutorials%2C-blog-posts-and-example-sites">list of tutorials</a>
+      a <a href="https://github.com/jashkenas/backbone/wiki/Tutorials%2C-blog-posts-and-example-sites">list of tutorials</a>
       and a <a href="#examples">long list of real-world projects</a> that use Backbone.
-      Backbone is available for use under the <a href="http://github.com/documentcloud/backbone/blob/master/LICENSE">MIT software license</a>.
+      Backbone is available for use under the <a href="http://github.com/jashkenas/backbone/blob/master/LICENSE">MIT software license</a>.
     </p>
 
     <p>
       You can report bugs and discuss features on the
-      <a href="http://github.com/documentcloud/backbone/issues">GitHub issues page</a>,
+      <a href="http://github.com/jashkenas/backbone/issues">GitHub issues page</a>,
       on Freenode IRC in the <tt>#documentcloud</tt> channel, post questions to the
       <a href="https://groups.google.com/forum/#!forum/backbonejs">Google Group</a>,
-      add pages to the <a href="https://github.com/documentcloud/backbone/wiki">wiki</a>
+      add pages to the <a href="https://github.com/jashkenas/backbone/wiki">wiki</a>
       or send tweets to <a href="http://twitter.com/documentcloud">@documentcloud</a>.
     </p>
 
@@ -557,22 +558,22 @@ <h2 id="downloads">
 
     <table>
       <tr>
-        <td><a class="punch" href="backbone.js">Development Version (1.0.0)</a></td>
-        <td class="text"><i>58kb, Full source, tons of comments</i></td>
+        <td><a class="punch" href="backbone.js">Development Version (1.1.0)</a></td>
+        <td class="text"><i>59kb, Full source, tons of comments</i></td>
       </tr>
       <tr>
-        <td><a class="punch" href="backbone-min.js">Production Version (1.0.0)</a></td>
+        <td><a class="punch" href="backbone-min.js">Production Version (1.1.0)</a></td>
         <td class="text" style="line-height: 16px;">
-          <i>7.1kb, Packed and gzipped</i><br />
+          <i>6.4kb, Packed and gzipped</i><br />
           <small>(<a href="backbone-min.map">Source Map</a>)</small>
         </td>
       </tr>
       <tr>
-        <td><a class="punch" href="https://raw.github.com/documentcloud/backbone/master/backbone.js">Edge Version (master)</a></td>
+        <td><a class="punch" href="https://raw.github.com/jashkenas/backbone/master/backbone.js">Edge Version (master)</a></td>
         <td>
           <i>Unreleased, use at your own risk</i>
-          <a class="travis-badge" href="https://travis-ci.org/documentcloud/backbone">
-            <img src="https://travis-ci.org/documentcloud/backbone.png" />
+          <a class="travis-badge" href="https://travis-ci.org/jashkenas/backbone">
+            <img src="https://travis-ci.org/jashkenas/backbone.png" />
           </a>
         </td>
       </tr>
@@ -580,12 +581,16 @@ <h2 id="downloads">
 
     <p>
       Backbone's only hard dependency is
-      <a href="http://underscorejs.org/">Underscore.js</a> <small>( >= 1.4.3)</small>.
+      <b><a href="http://underscorejs.org/">Underscore.js</a></b>.
       For RESTful persistence, history support via <a href="#Router">Backbone.Router</a>
       and DOM manipulation with <a href="#View">Backbone.View</a>, include
-      <a href="https://github.com/douglascrockford/JSON-js">json2.js</a>, and either
-      <a href="http://jquery.com">jQuery</a> <small>( >= 1.7.0)</small> or
-      <a href="http://zeptojs.com/">Zepto</a>.
+      <b><a href="http://jquery.com">jQuery</a></b>, and
+      <b><a href="https://github.com/douglascrockford/JSON-js">json2.js</a></b> for older
+      Internet Explorer support.
+      <i>(Mimics of the Underscore and jQuery APIs, such as
+      <a href="http://lodash.com">Lo-Dash</a> and
+      <a href="http://zeptojs.com">Zepto</a>, will
+      also tend to work, with varying degrees of compatibility.)</i>
     </p>
 
     <h2 id="introduction">Introduction</h2>
@@ -613,6 +618,17 @@ <h2 id="introduction">Introduction</h2>
       &mdash; when the model changes, the views simply update themselves.
     </p>
 
+    <p>
+      Philosophically, Backbone is an attempt to discover the minimal set
+      of data-structuring (models and collections) and user interface (views
+      and URLs) primitives that are generally useful when building web applications with
+      JavaScript. In an ecosystem where overarching, decides-everything-for-you
+      frameworks are commonplace, and many libraries require your site to be 
+      reorganized to suit their look, feel, and default behavior — Backbone should
+      continue to be a tool that gives you the <i>freedom</i> to design the full
+      experience of your web application.
+    </p>
+
     <p>
       If you're new here, and aren't yet quite sure what Backbone is for, start by
       browsing the <a href="#examples">list of Backbone-based projects</a>.
@@ -784,10 +800,12 @@ <h2 id="Events">Backbone.Events</h2>
     <p id="Events-listenTo">
       <b class="header">listenTo</b><code>object.listenTo(other, event, callback)</code>
       <br />
-      Tell an <b>object</b> to listen to a particular event on an <b>other</b> object.
-      The advantage of using this form, instead of <tt>other.on(event, callback)</tt>,
-      is that <b>listenTo</b> allows the <b>object</b> to keep track of the events,
-      and they can be removed all at once later on.
+      Tell an <b>object</b> to listen to a particular event on an <b>other</b>
+      object.  The advantage of using this form, instead of <tt>other.on(event,
+      callback, object)</tt>, is that <b>listenTo</b> allows the <b>object</b>
+      to keep track of the events, and they can be removed all at once later
+      on.  The <b>callback</b> will always be called with <b>object</b> as
+      context.
     </p>
 
 <pre>
@@ -839,10 +857,21 @@ <h2 id="Events">Backbone.Events</h2>
       <li><b>"error"</b> (model, xhr, options) &mdash; when a model's <a href="#Model-save">save</a> call fails on the server. </li>
       <li><b>"invalid"</b> (model, error, options) &mdash; when a model's <a href="#Model-validate">validation</a> fails on the client. </li>
       <li><b>"route:[name]"</b> (params) &mdash; Fired by the router when a specific route is matched.</li>
-      <li><b>"route"</b> (router, route, params) &mdash; Fired by history (or router) when <i>any</i> route has been matched.</li>
+      <li><b>"route"</b> (route, params) &mdash; Fired by the router when <i>any</i> route has been matched.</li>
+      <li><b>"route"</b> (router, route, params) &mdash; Fired by history when <i>any</i> route has been matched.</li>
       <li><b>"all"</b> &mdash; this special event fires for <i>any</i> triggered event, passing the event name as the first argument. </li>
     </ul>
 
+    <p>
+      Generally speaking, when calling a function that emits an event
+      (<tt>model.set()</tt>, <tt>collection.add</tt>, and so on...),
+      if you'd like to prevent the event from being triggered, you may pass
+      <tt>{silent: true}</tt> as an option. Note that this is <i>rarely</i>,
+      perhaps even never, a good idea. Passing through a specific flag
+      in the options for your event callback to look at, and choose to ignore,
+      will usually work out better.
+    </p>
+
     <h2 id="Model">Backbone.Model</h2>
 
     <p>
@@ -974,7 +1003,9 @@ <h2 id="Model">Backbone.Model</h2>
       gains a <tt>collection</tt> property that will be used to indicate which
       collection the model belongs to, and is used to help compute the model's
       <a href="#Model-url">url</a>. The <tt>model.collection</tt> property is
-      otherwise added automatically when you first add a model to a collection.
+      normally created automatically when you first add a model to a collection.
+      Note that the reverse is not true, as passing this option to the constructor 
+      will not automatically add the model to the collection. Useful, sometimes.
     </p>
 
     <p>
@@ -994,11 +1025,10 @@ <h2 id="Model">Backbone.Model</h2>
       <b class="header">set</b><code>model.set(attributes, [options])</code>
       <br />
       Set a hash of attributes (one or many) on the model. If any of the attributes
-      change the model's state, a <tt>"change"</tt> event will be triggered, unless
-      <tt>{silent: true}</tt> is passed as an option. Change events for specific
-      attributes are also triggered, and you can bind to those as well, for example:
-      <tt>change:title</tt>, and <tt>change:content</tt>. You may also pass
-      individual keys and values.
+      change the model's state, a <tt>"change"</tt> event will be triggered on the model.
+      Change events for specific attributes are also triggered, and you can bind
+      to those as well, for example: <tt>change:title</tt>, and <tt>change:content</tt>.
+      You may also pass individual keys and values.
     </p>
 
 <pre>
@@ -1114,7 +1144,7 @@ <h2 id="Model">Backbone.Model</h2>
       <b class="header">changed</b><code>model.changed</code>
       <br />
       The <b>changed</b> property is the internal hash containing all the attributes
-      that have changed since the last <tt>"change"</tt> event was triggered.
+      that have changed since the last <a href="Model#set">set</a>.
       Please do not update <b>changed</b> directly since its state is internally maintained
       by <a href="#Model-set">set</a>.  A copy of <b>changed</b> can be acquired from
       <a href="#Model-changedAttributes">changedAttributes</a>.
@@ -1147,9 +1177,9 @@ <h2 id="Model">Backbone.Model</h2>
     </p>
 
     <p id="Model-toJSON">
-      <b class="header">toJSON</b><code>model.toJSON()</code>
+      <b class="header">toJSON</b><code>model.toJSON([options])</code>
       <br />
-      Return a copy of the model's <a href="#Model-attributes">attributes</a>
+      Return a shallow copy of the model's <a href="#Model-attributes">attributes</a>
       for JSON stringification.  This can be used for persistence,
       serialization, or for augmentation before being sent to the server. The
       name of this method is a bit confusing, as it doesn't actually return a
@@ -1187,8 +1217,7 @@ <h2 id="Model">Backbone.Model</h2>
       latest server state. A <tt>"change"</tt> event will be triggered if the
       server's state differs from the current attributes. Accepts
       <tt>success</tt> and <tt>error</tt> callbacks in the options hash, which
-      are passed <tt>(model, response, options)</tt>
-      and <tt>(model, xhr, options)</tt> as arguments, respectively.
+      are both passed <tt>(model, response, options)</tt> as arguments.
     </p>
 
 <pre>
@@ -1472,7 +1501,7 @@ <h2 id="Model">Backbone.Model</h2>
     <p id="Model-hasChanged">
       <b class="header">hasChanged</b><code>model.hasChanged([attribute])</code>
       <br />
-      Has the model changed since the last <tt>"change"</tt> event? If an <b>attribute</b>
+      Has the model changed since the last <a href="#Model-set">set</a>? If an <b>attribute</b>
       is passed, returns <tt>true</tt> if that specific attribute has changed.
     </p>
 
@@ -1492,8 +1521,8 @@ <h2 id="Model">Backbone.Model</h2>
     <p id="Model-changedAttributes">
       <b class="header">changedAttributes</b><code>model.changedAttributes([attributes])</code>
       <br />
-      Retrieve a hash of only the model's attributes that have changed, or
-      <tt>false</tt> if there are none. Optionally, an external
+      Retrieve a hash of only the model's attributes that have changed since the last
+      <a href="#Model-set">set</a>, or <tt>false</tt> if there are none. Optionally, an external
       <b>attributes</b> hash can be passed in, returning the attributes in that
       hash which differ from the model. This can be used to figure out which
       portions of a view should be updated, or what calls
@@ -1542,7 +1571,7 @@ <h2 id="Collection">Backbone.Collection</h2>
       triggered on the collection directly, for convenience.
       This allows you to listen for changes to specific attributes in any
       model in a collection, for example:
-      <tt>Documents.on("change:selected", ...)</tt>
+      <tt>documents.on("change:selected", ...)</tt>
     </p>
 
     <p id="Collection-extend">
@@ -1571,7 +1600,7 @@ <h2 id="Collection">Backbone.Collection</h2>
 
     <p>
       A collection can also contain polymorphic models by overriding this property
-      with a function that returns a model.
+      with a constructor that returns a model.
     </p>
 
 <pre>
@@ -1589,22 +1618,21 @@ <h2 id="Collection">Backbone.Collection</h2>
 </pre>
 
     <p id="Collection-constructor">
-      <b class="header">constructor / initialize</b><code>new Collection([models], [options])</code>
+      <b class="header">constructor / initialize</b><code>new Backbone.Collection([models], [options])</code>
       <br />
       When creating a Collection, you may choose to pass in the initial array
       of <b>models</b>.  The collection's <a href="#Collection-comparator">comparator</a>
       may be included as an option. Passing <tt>false</tt> as the
       comparator option will prevent sorting. If you define an
       <b>initialize</b> function, it will be invoked when the collection is
-      created. There are several options that, if provided, are attached to the
-      collection directly: <tt>url</tt>, <tt>model</tt> and <tt>comparator</tt>.
+      created. There are a couple of options that, if provided, are attached to
+      the collection directly: <tt>model</tt> and <tt>comparator</tt>.
     </p>
 
 <pre>
 var tabs = new TabSet([tab1, tab2, tab3]);
 var spaces = new Backbone.Collection([], {
-  model: Space,
-  url: '/spaces'
+  model: Space
 });
 </pre>
 
@@ -1618,9 +1646,10 @@ <h2 id="Collection">Backbone.Collection</h2>
     </p>
 
     <p id="Collection-toJSON">
-      <b class="header">toJSON</b><code>collection.toJSON()</code>
+      <b class="header">toJSON</b><code>collection.toJSON([options])</code>
       <br />
-      Return an array containing the attributes hash of each model in the
+      Return an array containing the attributes hash of each model
+      (via <a href="#Model-toJSON">toJSON</a>) in the
       collection. This can be used to serialize and persist the
       collection as a whole. The name of this method is a bit confusing, because
       it conforms to
@@ -1668,7 +1697,6 @@ <h2 id="Collection">Backbone.Collection</h2>
       <li><a href="http://underscorejs.org/#min">min</a></li>
       <li><a href="http://underscorejs.org/#sortBy">sortBy</a></li>
       <li><a href="http://underscorejs.org/#groupBy">groupBy</a></li>
-      <li><a href="http://underscorejs.org/#sortedIndex">sortedIndex</a></li>
       <li><a href="http://underscorejs.org/#shuffle">shuffle</a></li>
       <li><a href="http://underscorejs.org/#toArray">toArray</a></li>
       <li><a href="http://underscorejs.org/#size">size</a></li>
@@ -1704,10 +1732,10 @@ <h2 id="Collection">Backbone.Collection</h2>
     <p id="Collection-add">
       <b class="header">add</b><code>collection.add(models, [options])</code>
       <br />
-      Add a model (or an array of models) to the collection. Fires an <tt>"add"</tt>
-      event, which you can pass <tt>{silent: true}</tt> to suppress. If a
-      <a href="#Collection-model">model</a> property is defined, you may also pass
+      Add a model (or an array of models) to the collection, firing an <tt>"add"</tt>
+      event. If a <a href="#Collection-model">model</a> property is defined, you may also pass
       raw attributes objects, and have them be vivified as instances of the model.
+      Returns the added (or preexisting, if duplicate) models.
       Pass <tt>{at: index}</tt> to splice the model into the collection at the
       specified <tt>index</tt>. If you're adding models to the collection that are
       <i>already</i> in the collection, they'll be ignored, unless you pass
@@ -1736,8 +1764,8 @@ <h2 id="Collection">Backbone.Collection</h2>
     <p id="Collection-remove">
       <b class="header">remove</b><code>collection.remove(models, [options])</code>
       <br />
-      Remove a model (or an array of models) from the collection. Fires a
-      <tt>"remove"</tt> event, which you can use <tt>silent</tt> to suppress.
+      Remove a model (or an array of models) from the collection, and returns them. 
+      Fires a <tt>"remove"</tt> event, which you can use <tt>silent</tt> to suppress.
       The model's index before removal is available to listeners as
       <tt>options.index</tt>.
     </p>
@@ -1749,9 +1777,9 @@ <h2 id="Collection">Backbone.Collection</h2>
       you have so many models to change that you'd rather just update the collection
       in bulk. Use <b>reset</b> to replace a collection with a new list
       of models (or attribute hashes), triggering a single <tt>"reset"</tt> event
-      at the end. Pass <tt>{silent: true}</tt> to suppress the <tt>"reset"</tt> event.
-      For convenience, within a <tt>"reset"</tt> event, the list of any previous
-      models is available as <tt>options.previousModels</tt>.
+      at the end. Returns the newly-set models.
+      For convenience, within a <tt>"reset"</tt> event, the list of any
+      previous models is available as <tt>options.previousModels</tt>.
     </p>
 
     <p>
@@ -1774,20 +1802,21 @@ <h2 id="Collection">Backbone.Collection</h2>
     <p id="Collection-set">
       <b class="header">set</b><code>collection.set(models, [options])</code>
       <br />
-      The <b>set</b> method tries to peform a "smart" update of the collection
+      The <b>set</b> method performs a "smart" update of the collection
       with the passed list of models. If a model in the list isn't yet in the
       collection it will be added; if the model is already in the collection
       its attributes will be merged; and if the collection contains any models that
       <i>aren't</i> present in the list, they'll be removed. All of the appropriate
       <tt>"add"</tt>, <tt>"remove"</tt>, and <tt>"change"</tt> events are fired
-      as this happens. If you'd like to customize the behavior, you can disable
+      as this happens. Returns the touched models in the collection.
+      If you'd like to customize the behavior, you can disable
       it with options: <tt>{add: false}</tt>, <tt>{remove: false}</tt>, or <tt>{merge: false}</tt>.
     </p>
 
 <pre>
-var vanHalen = new Collection([eddie, alex, stone, roth]);
+var vanHalen = new Backbone.Collection([eddie, alex, stone, roth]);
 
-vanHalen.update([eddie, alex, stone, hagar]);
+vanHalen.set([eddie, alex, stone, hagar]);
 
 // Fires a "remove" event for roth, and an "add" event for "hagar".
 // Updates any of stone, alex, and eddie's attributes that may have
@@ -1802,7 +1831,7 @@ <h2 id="Collection">Backbone.Collection</h2>
     </p>
 
 <pre>
-var book = Library.get(110);
+var book = library.get(110);
 </pre>
 
     <p id="Collection-at">
@@ -1889,9 +1918,7 @@ <h2 id="Collection">Backbone.Collection</h2>
 var Chapter  = Backbone.Model;
 var chapters = new Backbone.Collection;
 
-chapters.comparator = function(chapter) {
-  return chapter.get("page");
-};
+chapters.comparator = 'page';
 
 chapters.add(new Chapter({page: 9, title: "The End"}));
 chapters.add(new Chapter({page: 5, title: "The Middle"}));
@@ -1913,16 +1940,14 @@ <h2 id="Collection">Backbone.Collection</h2>
       normal circumstances, as a collection with a <a href="#Collection-comparator">comparator</a>
       will sort itself whenever a model is added. To disable sorting when adding
       a model, pass <tt>{sort: false}</tt> to <tt>add</tt>. Calling <b>sort</b>
-      triggers a <tt>"sort"</tt> event on the collection, unless silenced by
-      passing
-      <tt>{silent: true}</tt>.
+      triggers a <tt>"sort"</tt> event on the collection.
     </p>
 
     <p id="Collection-pluck">
       <b class="header">pluck</b><code>collection.pluck(attribute)</code>
       <br />
       Pluck an attribute from each model in the collection. Equivalent to calling
-      <tt>map</tt>, and returning a single attribute from the iterator.
+      <tt>map</tt> and returning a single attribute from the iterator.
     </p>
 
 <pre class="runnable">
@@ -2017,14 +2042,12 @@ <h2 id="Collection">Backbone.Collection</h2>
       <b class="header">fetch</b><code>collection.fetch([options])</code>
       <br />
       Fetch the default set of models for this collection from the server,
-      resetting the collection when they arrive. The <b>options</b> hash takes
-      <tt>success</tt> and <tt>error</tt>
-      callbacks which will be passed <tt>(collection, response, options)</tt>
-      and <tt>(collection, xhr, options)</tt> as arguments, respectively.
-      When the model data returns from the server, the collection will be (efficiently)
-      <a href="#Collection-reset">reset</a>, unless you pass <tt>{update: true}</tt>,
-      in which case it will use <a href="#Collection-update">update</a> to (intelligently)
-      merge the fetched models.
+      <a href="#Collection-set">setting</a> them on the collection when they arrive.
+      The <b>options</b> hash takes <tt>success</tt> and <tt>error</tt> callbacks
+      which will both be passed <tt>(collection, response, options)</tt> as arguments.
+      When the model data returns from the server, it uses <a href="#Collection-set">set</a>
+      to (intelligently) merge the fetched models, unless you pass <tt>{reset: true}</tt>,
+      in which case the collection will be (efficiently) <a href="#Collection-reset">reset</a>.
       Delegates to <a href="#Sync">Backbone.sync</a>
       under the covers for custom persistence strategies and returns a
       <a href="http://api.jquery.com/jQuery.ajax/#jqXHR">jqXHR</a>.
@@ -2045,10 +2068,10 @@ <h2 id="Collection">Backbone.Collection</h2>
 
     <p>
       The behavior of <b>fetch</b> can be customized by using the available
-      <a href="#Collection-update">update</a> options. For example, to fetch a
+      <a href="#Collection-set">set</a> options. For example, to fetch a
       collection, getting an <tt>"add"</tt> event for every new model, and
       a <tt>"change"</tt> event for every changed existing model, without
-      removing anything: <tt>collection.fetch({update: true, remove: false})</tt>
+      removing anything: <tt>collection.fetch({remove: false})</tt>
     </p>
 
     <p>
@@ -2181,6 +2204,13 @@ <h2 id="Router">Backbone.Router</h2>
       and <tt>"installing"</tt> to the action in the second.
     </p>
 
+    <p>
+      Trailing slashes are treated as part of the URL, and (correctly) treated
+      as a unique route when accessed. <tt>docs</tt> and <tt>docs/</tt> will fire
+      different callbacks. If you can't avoid generating both types of URLs, you
+      can define a <tt>"docs(/)"</tt> matcher to capture both cases.
+    </p>
+
     <p>
       When the visitor presses the back button, or enters a URL, and a particular
       route is matched, the name of the action will be fired as an
@@ -2222,7 +2252,7 @@ <h2 id="Router">Backbone.Router</h2>
       an argument to the callback. The <tt>name</tt> argument will be triggered as
       a <tt>"route:name"</tt> event whenever the route is matched.  If the
       <tt>callback</tt> argument is omitted <tt>router[name]</tt> will be used
-      instead.
+      instead. Routes added later may override previously declared routes.
     </p>
 
 <pre>
@@ -2363,7 +2393,7 @@ <h2 id="Sync">Backbone.sync</h2>
       with content-type <tt>application/json</tt>. When returning a JSON response,
       send down the attributes of the  model that have been changed by the server, and need
       to be updated on the client. When responding to a <tt>"read"</tt> request from a collection
-      (<a href="#Collection#fetch">Collection#fetch</a>), send down an array
+      (<a href="#Collection-fetch">Collection#fetch</a>), send down an array
       of model attribute objects.
     </p>
 
@@ -2443,7 +2473,7 @@ <h2 id="Sync">Backbone.sync</h2>
       encoded as <tt>application/json</tt>, setting <tt>Backbone.emulateJSON = true;</tt>
       will cause the JSON to be serialized under a <tt>model</tt> parameter, and
       the request to be made with a <tt>application/x-www-form-urlencoded</tt>
-      mime type, as if from an HTML form.
+      MIME type, as if from an HTML form.
     </p>
 
     <h2 id="View">Backbone.View</h2>
@@ -2486,7 +2516,7 @@ <h2 id="View">Backbone.View</h2>
 
   initialize: function() {
     this.listenTo(this.model, "change", this.render);
-  }
+  },
 
   render: function() {
     ...
@@ -2518,7 +2548,7 @@ <h2 id="View">Backbone.View</h2>
     </p>
 
 <pre>
-var doc = Documents.first();
+var doc = documents.first();
 
 new DocumentRow({
   model: doc,
@@ -2602,6 +2632,22 @@ <h2 id="View">Backbone.View</h2>
     };
   }
 });
+</pre>
+
+    <p id="View-template">
+      <b class="header">template</b><code>view.template([data])</code>
+      <br />
+      While templating for a view isn't a function provided directly by Backbone,
+      it's often a nice convention to define a <b>template</b> function on your 
+      views. In this way, when rendering your view, you have convenient access to
+      instance data (<tt>this.model</tt>, <tt>options</tt>, and so on). 
+      For example, using Underscore templates:
+    </p>
+
+<pre>
+var LibraryView = Backbone.View.extend({
+  template: _.template(...)
+});
 </pre>
 
     <p id="View-render">
@@ -2616,7 +2662,7 @@ <h2 id="View">Backbone.View</h2>
 
 <pre>
 var Bookmark = Backbone.View.extend({
-  template: _.template(…),
+  template: _.template(...),
   render: function() {
     this.$el.html(this.template(this.model.attributes));
     return this;
@@ -2757,7 +2803,7 @@ <h2 id="examples">Examples</h2>
     <p>
       The list of examples that follows, while long, is not exhaustive. If you've
       worked on an app that uses Backbone, please add it to the
-      <a href="https://github.com/documentcloud/backbone/wiki/Projects-and-Companies-using-Backbone">wiki page of Backbone apps</a>.
+      <a href="https://github.com/jashkenas/backbone/wiki/Projects-and-Companies-using-Backbone">wiki page of Backbone apps</a>.
     </p>
 
     <p id="examples-todos">
@@ -2835,27 +2881,6 @@ <h2 id="examples-rdio">Rdio</h2>
       </a>
     </div>
 
-    <h2 id="examples-linkedin">LinkedIn Mobile</h2>
-
-    <p>
-      <a href="http://www.linkedin.com/">LinkedIn</a> used Backbone.js to create
-      its <a href="http://www.linkedin.com/static?key=mobile">next-generation HTML5 mobile web app</a>.
-      Backbone made it easy to keep the app modular, organized and extensible so
-      that it was possible to program the complexities of LinkedIn's user experience.
-      The app also uses <a href="http://zeptojs.com/">Zepto</a>,
-      <a href="http://underscorejs.org/">Underscore.js</a>,
-      <a href="http://sass-lang.com/">SASS</a>, <a href="http://cubiq.org/iscroll">iScroll</a>,
-      HTML5 LocalStorage and Canvas. The tech team blogged about
-      <a href="http://engineering.linkedin.com/mobile/linkedin-ipad-using-local-storage-snappy-mobile-apps">their experiences using LocalStorage</a>
-      to improve mobile performance.
-    </p>
-
-    <div style="text-align: center;">
-      <a href="http://www.linkedin.com/static?key=mobile">
-        <img width="550" height"454" data-original="docs/images/linkedin-mobile.png" alt="LinkedIn Mobile" class="example_image" />
-      </a>
-    </div>
-
     <h2 id="examples-hulu">Hulu</h2>
 
     <p>
@@ -2894,6 +2919,41 @@ <h2 id="examples-quartz">Quartz</h2>
       </a>
     </div>
 
+    <h2 id="examples-gawker">Gawker Media</h2>
+
+    <p>
+      <a href="http://kinja.com">Kinja</a> is Gawker Media's publishing platform designed
+      to create great stories by breaking down the lines between the traditional
+      roles of content creators and consumers. Everyone — editors, readers,
+      marketers — have access to the same tools to engage in passionate discussion
+      and pursue the truth of the story. Sharing, recommending, and following within the
+      Kinja ecosystem allows for improved information discovery across all the sites.
+    </p>
+    <p>
+      Kinja is the platform behind
+      <a href="http://gawker.com/">Gawker</a>,
+      <a href="http://gizmodo.com/">Gizmodo</a>,
+      <a href="http://lifehacker.com/">Lifehacker</a>,
+      <a href="http://io9.com/">io9</a> and other Gawker Media
+      blogs. Backbone.js underlies the front-end application code that powers
+      everything from user authentication to post authoring, commenting, and even serving
+      ads. The JavaScript stack includes
+      <a href="http://underscorejs.org/">Underscore.js</a> and
+      <a href="http://jquery.com/">jQuery</a>, with some plugins,
+      all loaded with
+      <a href="http://requirejs.org/">RequireJS</a>. Closure templates are shared between the
+      <a href="http://www.playframework.com/">Play! Framework</a> based Scala application and Backbone views, and the responsive layout
+      is done with the
+      <a href="http://foundation.zurb.com/">Foundation</a> framework using
+      <a href="http://sass-lang.com/">SASS</a>.
+    </p>
+
+    <div style="text-align: center;">
+      <a href="http://gawker.com">
+        <img width="558" height="473" data-original="docs/images/gawker.png" alt="Gawker" class="example_image" />
+      </a>
+    </div>
+
     <h2 id="examples-flow">Flow</h2>
 
     <p>
@@ -2947,23 +3007,23 @@ <h2 id="examples-newsblur">NewsBlur</h2>
       </a>
     </div>
 
-  	<h2 id="examples-wordpress">WordPress.com</h2>
+    <h2 id="examples-wordpress">WordPress.com</h2>
 
-  	<p>
-  		<a href="http://wordpress.com/">WordPress.com</a> is the software-as-a-service
-  		version of <a href="http://wordpress.org">WordPress</a>. It uses Backbone.js
-  		Models, Collections, and Views in its
-  		<a href="http://en.blog.wordpress.com/2012/05/25/notifications-refreshed/">Notifications system</a>.  Backbone.js was selected
-  		because it was easy to fit into the structure of the application, not the
-  		other way around. <a href="http://automattic.com">Automattic</a>
-  		(the company behind WordPress.com) is integrating Backbone.js into the
-  		Stats tab and other features throughout the homepage.
-  	</p>
+    <p>
+      <a href="http://wordpress.com/">WordPress.com</a> is the software-as-a-service
+      version of <a href="http://wordpress.org">WordPress</a>. It uses Backbone.js
+      Models, Collections, and Views in its
+      <a href="http://en.blog.wordpress.com/2012/05/25/notifications-refreshed/">Notifications system</a>.  Backbone.js was selected
+      because it was easy to fit into the structure of the application, not the
+      other way around. <a href="http://automattic.com">Automattic</a>
+      (the company behind WordPress.com) is integrating Backbone.js into the
+      Stats tab and other features throughout the homepage.
+    </p>
 
     <div style="text-align: center;">
       <a href="http://wordpress.com/">
         <img width="550" height="387" data-original="docs/images/wpcom-notifications.png" alt="WordPress.com Notifications"
-  	title="WordPress.com Notifications" class="example_image" />
+    title="WordPress.com Notifications" class="example_image" />
       </a>
     </div>
 
@@ -3039,6 +3099,29 @@ <h2 id="examples-khan-academy">Khan Academy</h2>
       </a>
     </div>
 
+    <h2 id="examples-elife-lens">eLife Lens</h2>
+
+    <p>
+      <a href="http://elifesciences.github.io/lens/#about/figures/all/video_video1">eLife Lens</a>
+      is a novel system for writing on the web. Instead of tying the content to a
+      presentation focused format, Lens treats
+      <a href="http://blog.okfn.org/2013/01/15/content-as-data-towards-open-digital-publishing-with-substance/">content as data</a>
+      and makes the links that exist within a document easy to navigate. Backbone.js
+      is used to structure the views,
+      <a href="http://interior.substance.io/modules/document.html">Substance Document</a>
+      for representing content and
+      <a href="http://ken.quasipartikel.at/">Ken</a>
+      for faceted filtering. Read more in the official
+      <a href="http://www.elifesciences.org/lens/">introduction post</a>
+      or dig into the <a href="http://github.com/elifesciences/lens">source code</a>.
+    </p>
+
+    <div style="text-align: center;">
+      <a href="http://elifesciences.github.io/lens/#about/figures/all/video_video1">
+        <img width="510" height="383" data-original="docs/images/lens.png" alt="eLife Lens" class="example_retina" />
+      </a>
+    </div>
+
     <h2 id="examples-do">Do</h2>
 
     <p>
@@ -3110,6 +3193,30 @@ <h2 id="examples-spin">Spin</h2>
       </a>
     </div>
 
+    <h2 id="examples-zocdoc">ZocDoc</h2>
+
+    <p>
+      <a href="http://www.zocdoc.com">ZocDoc</a> helps patients
+      find local, in-network doctors and dentists, see their real-time 
+      availability, and instantly book appointments.
+      On the public side, the webapp uses Backbone.js to handle client-side state and rendering in 
+      <a href="http://www.zocdoc.com/primary-care-doctors/los-angeles-13122pm">search pages</a>
+      and <a href="http://www.zocdoc.com/doctor/nathan-hashimoto-md-58078">doctor profiles</a>. 
+      In addition, the new version of the doctor-facing part of the website is a 
+      large single-page application that 
+      benefits from Backbone's structure and modularity. ZocDoc's Backbone 
+      classes are tested with 
+      <a href="http://pivotal.github.io/jasmine/">Jasmine</a>, and delivered 
+      to the end user with 
+      <a href="http://getcassette.net/">Cassette</a>.
+    </p>
+
+    <div style="text-align: center;">
+      <a href="http://www.zocdoc.com">
+        <img width="510" height="464" data-original="docs/images/zocdoc.jpg" alt="ZocDoc" class="example_retina" />
+      </a>
+    </div>
+
     <h2 id="examples-walmart">Walmart Mobile</h2>
 
     <p>
@@ -3197,7 +3304,7 @@ <h2 id="examples-stripe">Stripe</h2>
       <a href="https://stripe.com">Stripe</a> provides an API for accepting
       credit cards on the web. Stripe's
       <a href="https://manage.stripe.com">management interface</a> was recently
-      rewritten from scratch in Coffeescript using Backbone.js as the primary
+      rewritten from scratch in CoffeeScript using Backbone.js as the primary
       framework, <a href="https://github.com/sstephenson/eco">Eco</a> for templates, <a href="http://sass-lang.com/">Sass</a> for stylesheets, and <a href="https://github.com/sstephenson/stitch">Stitch</a> to package
       everything together as <a href="http://commonjs.org/">CommonJS</a> modules. The new app uses
       <a href="https://stripe.com/docs/api">Stripe's API</a> directly for the
@@ -3279,7 +3386,7 @@ <h2 id="examples-artsy">Art.sy</h2>
       love. Art.sy is built on Rails, using
       <a href="https://github.com/intridea/grape">Grape</a> to serve a robust
       <a href="http://artsy.net/api">JSON API</a>. The main site is a single page
-      app written in Coffeescript and uses Backbone to provide structure around
+      app written in CoffeeScript and uses Backbone to provide structure around
       this API. An admin panel and partner CMS have also been extracted into
       their own API-consuming Backbone projects.
     </p>
@@ -3342,7 +3449,7 @@ <h2 id="examples-code-school">Code School</h2>
       everything it has to offer: the router, collections, models, and complex
       event handling. Before, the page was a mess of <a href="http://jquery.com/">jQuery</a> DOM manipulation
       and manual Ajax calls. Backbone.js helped introduce a new way to
-      think about developing an organized front-end application in Javascript.
+      think about developing an organized front-end application in JavaScript.
     </p>
 
     <div style="text-align: center;">
@@ -3404,26 +3511,6 @@ <h2 id="examples-easel">Easel</h2>
       </a>
     </div>
 
-    <h2 id="examples-prose">Prose</h2>
-
-    <p>
-      <a href="http://prose.io">Prose</a> is a content editor for GitHub,
-      optimized for managing websites built with
-      <a href="http://jekyllrb.com/">Jekyll</a> and Github Pages. Prose is
-      itself implemented as a static Jekyll site, using Backbone.js to render
-      the views and handle the routes, as well as
-      <a href="http://github.com/michael/github">Github.js</a>, a small data
-      abstraction layer for manipulating files directly on Github. Read more in the
-      <a href="http://developmentseed.org/blog/2012/june/25/prose-a-content-editor-for-github/">official introduction post</a>,
-      or <a href="https://github.com/prose/prose">take a look at the source code</a>.
-    </p>
-
-    <div style="text-align: center;">
-      <a href="http://prose.io">
-        <img width="550" height="447" data-original="docs/images/prose.png" alt="Prose" class="example_image" />
-      </a>
-    </div>
-
     <h2 id="examples-jolicloud">Jolicloud</h2>
 
     <p>
@@ -3445,22 +3532,6 @@ <h2 id="examples-jolicloud">Jolicloud</h2>
       </a>
     </div>
 
-    <h2 id="examples-battlefield">Battlefield Play4Free</h2>
-
-    <p>
-      <a href="http://battlefield.play4free.com/">Battlefield Play4Free</a> is
-      the latest free-to-play first person shooter from the same team that
-      created Battlefield Heroes. The in-game HTML5 front-end for makes heavy use of
-      Backbone's views, models and collections to help keep the code modular
-      and structured.
-    </p>
-
-    <div style="text-align: center;">
-      <a href="http://battlefield.play4free.com/">
-        <img width="550" height="435" data-original="docs/images/battlefield.png" alt="Battlefield Play4Free" class="example_image" />
-      </a>
-    </div>
-
     <h2 id="examples-syllabus">Syllabus</h2>
 
     <p>
@@ -3582,7 +3653,7 @@ <h2 id="faq">F.A.Q.</h2>
     <p id="FAQ-why-backbone">
       <b class="header">Why use Backbone, not [other framework X]?</b>
       <br />
-      If your eye hasn't already been caught by the adaptibility and elan on display
+      If your eye hasn't already been caught by the adaptability and elan on display
       in the above <a href="#examples">list of examples</a>, we can get more specific:
       Backbone.js aims to provide the common foundation that data-rich web applications
       with ambitious interfaces require &mdash; while very deliberately avoiding
@@ -3605,7 +3676,7 @@ <h2 id="faq">F.A.Q.</h2>
         <a href="http://mustache.github.com">way</a>.
       </li>
       <li>
-        It's smaller. There's fewer kilobytes for your browser or phone to download,
+        It's smaller. There are fewer kilobytes for your browser or phone to download,
         and less <i>conceptual</i> surface area. You can read and understand
         the source in an afternoon.
       </li>
@@ -3618,7 +3689,7 @@ <h2 id="faq">F.A.Q.</h2>
         <a href="#Events">Synchronous events</a> are used as the fundamental
         building block, not a difficult-to-reason-about run loop, or by constantly
         polling and traversing your data structures to hunt for changes. And if
-        you want a specific event to be aynchronous and aggregated,
+        you want a specific event to be asynchronous and aggregated,
         <a href="http://underscorejs.org/#debounce">no problem</a>.
       </li>
       <li>
@@ -3644,7 +3715,7 @@ <h2 id="faq">F.A.Q.</h2>
       <li>
         There's no built-in performance penalty for choosing to structure your
         code with Backbone. And if you do want to optimize further, thin models and
-        templates with flexible granularity make it easy squeeze every last
+        templates with flexible granularity make it easy to squeeze every last
         drop of potential performance out of, say, IE8.
       </li>
     </ul>
@@ -3731,13 +3802,13 @@ <h2 id="faq">F.A.Q.</h2>
 
 // And then, when the Inbox is opened:
 
-inbox.messages.fetch();
+inbox.messages.fetch({reset: true});
 </pre>
 
     <p>
       If you're looking for something more opinionated, there are a number of
       Backbone plugins that add sophisticated associations among models,
-      <a href="https://github.com/documentcloud/backbone/wiki/Extensions%2C-Plugins%2C-Resources">available on the wiki</a>.
+      <a href="https://github.com/jashkenas/backbone/wiki/Extensions%2C-Plugins%2C-Resources">available on the wiki</a>.
     </p>
 
     <p>
@@ -3922,7 +3993,38 @@ <h2 id="faq">F.A.Q.</h2>
 
     <h2 id="changelog">Change Log</h2>
 
-    <b class="header">1.0.0</b> &mdash; <small><i>March 20, 2013</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.10...1.0.0">Diff</a><br />
+    <b class="header">1.1.0</b> &mdash; <small><i>Oct. 10, 2013</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.0.0...1.1.0">Diff</a><br />
+    <ul style="margin-top: 5px;">
+      <li>
+        Made the return values of Collection's <tt>set</tt>, <tt>add</tt>, 
+        <tt>remove</tt>, and <tt>reset</tt> more useful. Instead of returning
+        <tt>this</tt>, they now return the changed (added, removed or updated) 
+        model or list of models.
+      </li>
+      <li>
+        Backbone Views no longer attach "special" options as direct properties
+        on the view (<tt>model</tt>, <tt>attributes</tt>, <tt>className</tt>, and so on).
+      </li>
+      <li>
+        All <tt>"invalid"</tt> events now pass consistent arguments. First the
+        model in question, then the error object, then options.
+      </li>
+      <li>
+        You are no longer permitted to change the <b>id</b> of your model during
+        <tt>parse</tt>. Use <tt>idAttribute</tt> instead.
+      </li>
+      <li>
+        On the other hand, <tt>parse</tt> is now an excellent place to extract
+        and vivify incoming nested JSON into associated submodels.
+      </li>
+      <li>
+        Many tweaks, optimizations and bugfixes relating to Backbone 1.0, 
+        including URL overrides, mutation of options, bulk ordering, trailing
+        slashes, edge-case listener leaks, nested model parsing...
+      </li>
+    </ul>
+
+    <b class="header">1.0.0</b> &mdash; <small><i>March 20, 2013</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.9.10...1.0.0">Diff</a><br />
     <ul style="margin-top: 5px;">
       <li>
         Renamed Collection's "update" to <a href="#Collection-set">set</a>, for
@@ -3956,7 +4058,7 @@ <h2 id="changelog">Change Log</h2>
       </li>
     </ul>
 
-    <b class="header">0.9.10</b> &mdash; <small><i>Jan. 15, 2013</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.9...0.9.10">Diff</a><br />
+    <b class="header">0.9.10</b> &mdash; <small><i>Jan. 15, 2013</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.9.9...0.9.10">Diff</a><br />
     <ul style="margin-top: 5px;">
       <li>
         A <tt>"route"</tt> event is triggered on the router in addition
@@ -3997,7 +4099,7 @@ <h2 id="changelog">Change Log</h2>
       </li>
     </ul>
 
-    <b class="header">0.9.9</b> &mdash; <small><i>Dec. 13, 2012</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.2...0.9.9">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.9.9/index.html">Docs</a><br />
+    <b class="header">0.9.9</b> &mdash; <small><i>Dec. 13, 2012</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.9.2...0.9.9">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.9.9/index.html">Docs</a><br />
     <ul style="margin-top: 5px;">
       <li>
         Added <a href="#Events-listenTo">listenTo</a>
@@ -4113,9 +4215,13 @@ <h2 id="changelog">Change Log</h2>
         parameters.  Routes like <tt>search?query=…&amp;page=3</tt> should become
         <tt>search/…/3</tt>.
       </li>
+      <li>
+        <tt>Model#set</tt> no longer accepts another model as an argument.  This leads
+        to subtle problems and is easily replaced with <tt>model.set(other.attributes)</tt>.
+      </li>
     </ul>
 
-    <b class="header">0.9.2</b> &mdash; <small><i>March 21, 2012</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.1...0.9.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.9.2/index.html">Docs</a><br />
+    <b class="header">0.9.2</b> &mdash; <small><i>March 21, 2012</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.9.1...0.9.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.9.2/index.html">Docs</a><br />
     <ul style="margin-top: 5px;">
       <li>
         Instead of throwing an error when adding duplicate models to a collection,
@@ -4157,7 +4263,7 @@ <h2 id="changelog">Change Log</h2>
       </li>
     </ul>
 
-    <b class="header">0.9.1</b> &mdash; <small><i>Feb. 2, 2012</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.0...0.9.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.9.1/index.html">Docs</a><br />
+    <b class="header">0.9.1</b> &mdash; <small><i>Feb. 2, 2012</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.9.0...0.9.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.9.1/index.html">Docs</a><br />
     <ul style="margin-top: 5px;">
       <li>
         Reverted to 0.5.3-esque behavior for validating models. Silent changes
@@ -4175,7 +4281,7 @@ <h2 id="changelog">Change Log</h2>
       </li>
     </ul>
 
-    <b class="header">0.9.0</b> &mdash; <small><i>Jan. 30, 2012</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.5.3...0.9.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.9.0/index.html">Docs</a><br />
+    <b class="header">0.9.0</b> &mdash; <small><i>Jan. 30, 2012</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.5.3...0.9.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.9.0/index.html">Docs</a><br />
     <ul style="margin-top: 5px;">
       <li>
         Creating and destroying models with <tt>create</tt> and <tt>destroy</tt>
@@ -4273,7 +4379,7 @@ <h2 id="changelog">Change Log</h2>
     </ul>
 
     <p>
-      <b class="header">0.5.3</b> &mdash; <small><i>August 9, 2011</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.5.2...0.5.3">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.5.3/index.html">Docs</a><br />
+      <b class="header">0.5.3</b> &mdash; <small><i>August 9, 2011</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.5.2...0.5.3">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.5.3/index.html">Docs</a><br />
       A View's <tt>events</tt> property may now be defined as a function, as well
       as an object literal, making it easier to programmatically define and inherit
       events. <tt>groupBy</tt> is now proxied from Underscore as a method on Collections.
@@ -4283,7 +4389,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.5.2</b> &mdash; <small><i>July 26, 2011</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.5.1...0.5.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.5.2/index.html">Docs</a><br />
+      <b class="header">0.5.2</b> &mdash; <small><i>July 26, 2011</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.5.1...0.5.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.5.2/index.html">Docs</a><br />
       The <tt>bind</tt> function, can now take an optional third argument, to specify
       the <tt>this</tt> of the callback function.
       Multiple models with the same <tt>id</tt> are now allowed in a collection.
@@ -4294,7 +4400,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.5.1</b> &mdash; <small><i>July 5, 2011</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.5.0...0.5.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.5.1/index.html">Docs</a><br />
+      <b class="header">0.5.1</b> &mdash; <small><i>July 5, 2011</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.5.0...0.5.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.5.1/index.html">Docs</a><br />
       Cleanups from the 0.5.0 release, to wit: improved transparent upgrades from
       hash-based URLs to pushState, and vice-versa. Fixed inconsistency with
       non-modified attributes being passed to <tt>Model#initialize</tt>. Reverted
@@ -4303,9 +4409,9 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.5.0</b> &mdash; <small><i>July 1, 2011</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.3.3...0.5.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.5.0/index.html">Docs</a><br />
+      <b class="header">0.5.0</b> &mdash; <small><i>July 1, 2011</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.3.3...0.5.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.5.0/index.html">Docs</a><br />
       A large number of tiny tweaks and micro bugfixes, best viewed by looking
-      at <a href="https://github.com/documentcloud/backbone/compare/0.3.3...0.5.0">the commit diff</a>.
+      at <a href="https://github.com/jashkenas/backbone/compare/0.3.3...0.5.0">the commit diff</a>.
       HTML5 <tt>pushState</tt> support, enabled by opting-in with:
       <tt>Backbone.history.start({pushState: true})</tt>.
       <tt>Controller</tt> was renamed to <tt>Router</tt>, for clarity.
@@ -4327,7 +4433,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.3.3</b> &mdash; <small><i>Dec 1, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.3.2...0.3.3">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.3.3/index.html">Docs</a><br />
+      <b class="header">0.3.3</b> &mdash; <small><i>Dec 1, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.3.2...0.3.3">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.3.3/index.html">Docs</a><br />
       Backbone.js now supports <a href="http://zeptojs.com">Zepto</a>, alongside
       jQuery, as a framework for DOM manipulation and Ajax support.
       Implemented <a href="#Model-escape">Model#escape</a>, to efficiently handle
@@ -4338,7 +4444,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.3.2</b> &mdash; <small><i>Nov 23, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.3.1...0.3.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.3.2/index.html">Docs</a><br />
+      <b class="header">0.3.2</b> &mdash; <small><i>Nov 23, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.3.1...0.3.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.3.2/index.html">Docs</a><br />
       Bugfix for IE7 + iframe-based "hashchange" events. <tt>sync</tt> may now be
       overridden on a per-model, or per-collection basis. Fixed recursion error
       when calling <tt>save</tt> with no changed attributes, within a
@@ -4346,7 +4452,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.3.1</b> &mdash; <small><i>Nov 15, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.3.0...0.3.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.3.1/index.html">Docs</a><br />
+      <b class="header">0.3.1</b> &mdash; <small><i>Nov 15, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.3.0...0.3.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.3.1/index.html">Docs</a><br />
       All <tt>"add"</tt> and <tt>"remove"</tt> events are now sent through the
       model, so that views can listen for them without having to know about the
       collection. Added a <tt>remove</tt> method to <a href="#View">Backbone.View</a>.
@@ -4355,7 +4461,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.3.0</b> &mdash; <small><i>Nov 9, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.2.0...0.3.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.3.0/index.html">Docs</a><br />
+      <b class="header">0.3.0</b> &mdash; <small><i>Nov 9, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.2.0...0.3.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.3.0/index.html">Docs</a><br />
       Backbone now has <a href="#Controller">Controllers</a> and
       <a href="#History">History</a>, for doing client-side routing based on
       URL fragments.
@@ -4369,7 +4475,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.2.0</b> &mdash; <small><i>Oct 25, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.1.2...0.2.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.2.0/index.html">Docs</a><br />
+      <b class="header">0.2.0</b> &mdash; <small><i>Oct 25, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.1.2...0.2.0">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.2.0/index.html">Docs</a><br />
       Instead of requiring server responses to be namespaced under a <tt>model</tt>
       key, now you can define your own <a href="#Model-parse">parse</a> method
       to convert responses into attributes for Models and Collections.
@@ -4381,7 +4487,7 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.1.2</b> &mdash; <small><i>Oct 19, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.1.1...0.1.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.1.2/index.html">Docs</a><br />
+      <b class="header">0.1.2</b> &mdash; <small><i>Oct 19, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.1.1...0.1.2">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.1.2/index.html">Docs</a><br />
       Added a <a href="#Model-fetch">Model#fetch</a> method for refreshing the
       attributes of single model from the server.
       An <tt>error</tt> callback may now be passed to <tt>set</tt> and <tt>save</tt>
@@ -4395,13 +4501,13 @@ <h2 id="changelog">Change Log</h2>
     </p>
 
     <p>
-      <b class="header">0.1.1</b> &mdash; <small><i>Oct 14, 2010</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.1.0...0.1.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.1.1/index.html">Docs</a><br />
+      <b class="header">0.1.1</b> &mdash; <small><i>Oct 14, 2010</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/0.1.0...0.1.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.1.1/index.html">Docs</a><br />
       Added a convention for <tt>initialize</tt> functions to be called
       upon instance construction, if defined. Documentation tweaks.
     </p>
 
     <p>
-      <b class="header">0.1.0</b> &mdash; <small><i>Oct 13, 2010</i></small> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/documentcloud/backbone/0.1.0/index.html">Docs</a><br />
+      <b class="header">0.1.0</b> &mdash; <small><i>Oct 13, 2010</i></small> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/0.1.0/index.html">Docs</a><br />
       Initial Backbone release.
     </p>
 
diff --git a/bower_components/backbone/package.json b/bower_components/backbone/package.json
index c379cd32..79e5a2d7 100644
--- a/bower_components/backbone/package.json
+++ b/bower_components/backbone/package.json
@@ -8,13 +8,21 @@
     "underscore"  : ">=1.4.3"
   },
   "devDependencies": {
-    "phantomjs": "1.8.1-3",
+    "phantomjs": "1.9.0-1",
     "docco": "0.6.1",
     "coffee-script": "1.6.1"
   },
   "scripts": {
-    "test": "phantomjs test/vendor/runner.js test/index.html?noglobals=true && coffee test/model.coffee"
+    "test": "phantomjs test/vendor/runner.js test/index.html?noglobals=true && coffee test/model.coffee",
+    "build": "uglifyjs backbone.js --mangle --source-map backbone-min.map -o backbone-min.js",
+    "doc": "docco backbone.js && docco examples/todos/todos.js examples/backbone.localstorage.js",
+    "lint": "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
   },
   "main"          : "backbone.js",
-  "version"       : "1.0.0"
+  "version"       : "1.1.0",
+  "license"       : "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jashkenas/backbone.git"
+  }
 }
diff --git a/bower_components/backbone/test/collection.js b/bower_components/backbone/test/collection.js
index d068b396..748d7bba 100644
--- a/bower_components/backbone/test/collection.js
+++ b/bower_components/backbone/test/collection.js
@@ -1,12 +1,10 @@
-$(document).ready(function() {
+(function() {
 
   var a, b, c, d, e, col, otherCol;
 
-  module("Backbone.Collection", _.extend(new Environment, {
+  module("Backbone.Collection", {
 
     setup: function() {
-      Environment.prototype.setup.apply(this, arguments);
-
       a         = new Backbone.Model({id: 3, label: 'a'});
       b         = new Backbone.Model({id: 2, label: 'b'});
       c         = new Backbone.Model({id: 1, label: 'c'});
@@ -16,7 +14,7 @@ $(document).ready(function() {
       otherCol  = new Backbone.Collection();
     }
 
-  }));
+  });
 
   test("new and sort", 9, function() {
     var counter = 0;
@@ -87,7 +85,7 @@ $(document).ready(function() {
     equal(col2.get(model.clone()), col2.first());
   });
 
-  test("update index when id changes", 3, function() {
+  test("update index when id changes", 4, function() {
     var col = new Backbone.Collection();
     col.add([
       {id : 0, name : 'one'},
@@ -95,9 +93,10 @@ $(document).ready(function() {
     ]);
     var one = col.get(0);
     equal(one.get('name'), 'one');
-    one.set({id : 101});
+    col.on('change:name', function (model) { ok(this.get(model)); });
+    one.set({name: 'dalmatians', id : 101});
     equal(col.get(0), null);
-    equal(col.get(101).get('name'), 'one');
+    equal(col.get(101).get('name'), 'dalmatians');
   });
 
   test("at", 1, function() {
@@ -226,13 +225,13 @@ $(document).ready(function() {
   });
 
   test("add with parse and merge", function() {
-    var Model = Backbone.Model.extend({
-      parse: function (data) {
-        return data.model;
-      }
-    });
     var collection = new Backbone.Collection();
-    collection.model = Model;
+    collection.parse = function(attrs) {
+      return _.map(attrs, function(model) {
+        if (model.model) return model.model;
+        return model;
+      });
+    };
     collection.add({id: 1});
     collection.add({model: {id: 1, name: 'Alf'}}, {parse: true, merge: true});
     equal(collection.first().get('name'), 'Alf');
@@ -288,6 +287,39 @@ $(document).ready(function() {
     equal(otherRemoved, null);
   });
 
+  test("add and remove return values", 13, function() {
+    var Even = Backbone.Model.extend({
+      validate: function(attrs) {
+        if (attrs.id % 2 !== 0) return "odd";
+      }
+    });
+    var col = new Backbone.Collection;
+    col.model = Even;
+
+    var list = col.add([{id: 2}, {id: 4}], {validate: true});
+    equal(list.length, 2);
+    ok(list[0] instanceof Backbone.Model);
+    equal(list[1], col.last());
+    equal(list[1].get('id'), 4);
+
+    list = col.add([{id: 3}, {id: 6}], {validate: true});
+    equal(col.length, 3);
+    equal(list[0], false);
+    equal(list[1].get('id'), 6);
+
+    var result = col.add({id: 6});
+    equal(result.cid, list[1].cid);
+
+    result = col.remove({id: 6});
+    equal(col.length, 2);
+    equal(result.id, 6);
+
+    list = col.remove([{id: 2}, {id: 8}]);
+    equal(col.length, 1);
+    equal(list[0].get('id'), 2);
+    equal(list[1], null);
+  });
+
   test("shift and pop", 2, function() {
     var col = new Backbone.Collection([{a: 'a'}, {b: 'b'}, {c: 'c'}]);
     equal(col.shift().get('a'), 'a');
@@ -438,7 +470,7 @@ $(document).ready(function() {
     equal(model.collection, collection);
   });
 
-  test("create with validate:true enforces validation", 2, function() {
+  test("create with validate:true enforces validation", 3, function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
         return "fail";
@@ -448,7 +480,8 @@ $(document).ready(function() {
       model: ValidatingModel
     });
     var col = new ValidatingCollection();
-    col.on('invalid', function (collection, attrs, options) {
+    col.on('invalid', function (collection, error, options) {
+      equal(error, "fail");
       equal(options.validationError, 'fail');
     });
     equal(col.create({"foo":"bar"}, {validate:true}), false);
@@ -502,7 +535,7 @@ $(document).ready(function() {
     equal(coll.findWhere({a: 4}), void 0);
   });
 
-  test("Underscore methods", 13, function() {
+  test("Underscore methods", 14, function() {
     equal(col.map(function(model){ return model.get('label'); }).join(' '), 'a b c d');
     equal(col.any(function(model){ return model.id === 100; }), false);
     equal(col.any(function(model){ return model.id === 0; }), true);
@@ -520,18 +553,7 @@ $(document).ready(function() {
             .map(function(o){ return o.id * 2; })
             .value(),
          [4, 0]);
-  });
-
-  test("sortedIndex", function () {
-    var model = new Backbone.Model({key: 2});
-    var collection = new (Backbone.Collection.extend({
-      comparator: 'key'
-    }))([model, {key: 1}]);
-    equal(collection.sortedIndex(model), 1);
-    equal(collection.sortedIndex(model, 'key'), 1);
-    equal(collection.sortedIndex(model, function (model) {
-      return model.get('key');
-    }), 1);
+    deepEqual(col.difference([c, d]), [a, b]);
   });
 
   test("reset", 12, function() {
@@ -920,6 +942,20 @@ $(document).ready(function() {
     strictEqual(c.length, 0);
   });
 
+  test("set with many models does not overflow the stack", function() {
+    var n = 150000;
+    var collection = new Backbone.Collection();
+    var models = [];
+    for (var i = 0; i < n; i++) {
+      models.push({id: i});
+    }
+    collection.set(models);
+    equal(collection.length, n);
+    collection.reset();
+    collection.set(models, {at: 0});
+    equal(collection.length, n);
+  });
+
   test("set with only cids", 3, function() {
     var m1 = new Backbone.Model;
     var m2 = new Backbone.Model;
@@ -963,17 +999,33 @@ $(document).ready(function() {
     equal(col.first().get('key'), 'other');
 
     col.set({id: 1, other: 'value'});
-    equal(col.first().get('key'), 'value');
+    equal(col.first().get('key'), 'other');
     equal(col.length, 1);
   });
 
-  test("`set` and model level `parse`", function() {
+  test('merge without mutation', function () {
     var Model = Backbone.Model.extend({
-      parse: function (res) { return res.model; }
+      initialize: function (attrs, options) {
+        if (attrs.child) {
+          this.set('child', new Model(attrs.child, options), options);
+        }
+      }
     });
+    var Collection = Backbone.Collection.extend({model: Model});
+    var data = [{id: 1, child: {id: 2}}];
+    var collection = new Collection(data);
+    equal(collection.first().id, 1);
+    collection.set(data);
+    equal(collection.first().id, 1);
+    collection.set([{id: 2, child: {id: 2}}].concat(data));
+    deepEqual(collection.pluck('id'), [2, 1]);
+  });
+
+  test("`set` and model level `parse`", function() {
+    var Model = Backbone.Model.extend({});
     var Collection = Backbone.Collection.extend({
       model: Model,
-      parse: function (res) { return res.models; }
+      parse: function (res) { return _.pluck(res.models, 'model'); }
     });
     var model = new Model({id: 1});
     var collection = new Collection(model);
@@ -996,6 +1048,25 @@ $(document).ready(function() {
     collection.set({}, {parse: true});
   });
 
+  test('`set` matches input order in the absence of a comparator', function () {
+    var one = new Backbone.Model({id: 1});
+    var two = new Backbone.Model({id: 2});
+    var three = new Backbone.Model({id: 3});
+    var collection = new Backbone.Collection([one, two, three]);
+    collection.set([{id: 3}, {id: 2}, {id: 1}]);
+    deepEqual(collection.models, [three, two, one]);
+    collection.set([{id: 1}, {id: 2}]);
+    deepEqual(collection.models, [one, two]);
+    collection.set([two, three, one]);
+    deepEqual(collection.models, [two, three, one]);
+    collection.set([{id: 1}, {id: 2}], {remove: false});
+    deepEqual(collection.models, [two, three, one]);
+    collection.set([{id: 1}, {id: 2}, {id: 3}], {merge: false});
+    deepEqual(collection.models, [one, two, three]);
+    collection.set([three, two, one, {id: 4}], {add: false});
+    deepEqual(collection.models, [one, two, three]);
+  });
+
   test("#1894 - Push should not trigger a sort", 0, function() {
     var Collection = Backbone.Collection.extend({
       comparator: 'id',
@@ -1006,6 +1077,13 @@ $(document).ready(function() {
     new Collection().push({id: 1});
   });
 
+  test("#2428 - push duplicate models, return the correct one", 1, function() {
+    var col = new Backbone.Collection;
+    var model1 = col.push({id: 101});
+    var model2 = col.push({id: 101})
+    ok(model2.cid == model1.cid);
+  });
+
   test("`set` with non-normal id", function() {
     var Collection = Backbone.Collection.extend({
       model: Backbone.Model.extend({idAttribute: '_id'})
@@ -1081,20 +1159,119 @@ $(document).ready(function() {
     collection.add(collection.models, {merge: true}); // don't sort
   });
 
-  test("Attach options to collection.", 3, function() {
-      var url = '/somewhere';
-      var model = new Backbone.Model;
-      var comparator = function(){};
+  test("Attach options to collection.", 2, function() {
+    var model = new Backbone.Model;
+    var comparator = function(){};
 
-      var collection = new Backbone.Collection([], {
-        url: url,
-        model: model,
-        comparator: comparator
-      });
+    var collection = new Backbone.Collection([], {
+      model: model,
+      comparator: comparator
+    });
 
-      strictEqual(collection.url, url);
-      ok(collection.model === model);
-      ok(collection.comparator === comparator);
+    ok(collection.model === model);
+    ok(collection.comparator === comparator);
   });
 
-});
+  test("`add` overrides `set` flags", function () {
+    var collection = new Backbone.Collection();
+    collection.once('add', function (model, collection, options) {
+      collection.add({id: 2}, options);
+    });
+    collection.set({id: 1});
+    equal(collection.length, 2);
+  });
+
+  test("#2606 - Collection#create, success arguments", 1, function() {
+    var collection = new Backbone.Collection;
+    collection.url = 'test';
+    collection.create({}, {
+      success: function(model, resp, options) {
+        strictEqual(resp, 'response');
+      }
+    });
+    this.ajaxSettings.success('response');
+  });
+
+  test("#2612 - nested `parse` works with `Collection#set`", function() {
+
+    var Job = Backbone.Model.extend({
+      constructor: function() {
+        this.items = new Items();
+        Backbone.Model.apply(this, arguments);
+      },
+      parse: function(attrs) {
+        this.items.set(attrs.items, {parse: true});
+        return _.omit(attrs, 'items');
+      }
+    });
+
+    var Item = Backbone.Model.extend({
+      constructor: function() {
+        this.subItems = new Backbone.Collection();
+        Backbone.Model.apply(this, arguments);
+      },
+      parse: function(attrs) {
+        this.subItems.set(attrs.subItems, {parse: true});
+        return _.omit(attrs, 'subItems');
+      }
+    });
+
+    var Items = Backbone.Collection.extend({
+      model: Item
+    });
+
+    var data = {
+      name: 'JobName',
+      id: 1,
+      items: [{
+        id: 1,
+        name: 'Sub1',
+        subItems: [
+          {id: 1, subName: 'One'},
+          {id: 2, subName: 'Two'}
+        ]
+      }, {
+        id: 2,
+        name: 'Sub2',
+        subItems: [
+          {id: 3, subName: 'Three'},
+          {id: 4, subName: 'Four'}
+        ]
+      }]
+    };
+
+    var newData = {
+      name: 'NewJobName',
+      id: 1,
+      items: [{
+        id: 1,
+        name: 'NewSub1',
+        subItems: [
+          {id: 1,subName: 'NewOne'},
+          {id: 2,subName: 'NewTwo'}
+        ]
+      }, {
+        id: 2,
+        name: 'NewSub2',
+        subItems: [
+          {id: 3,subName: 'NewThree'},
+          {id: 4,subName: 'NewFour'}
+        ]
+      }]
+    };
+
+    var job = new Job(data, {parse: true});
+    equal(job.get('name'), 'JobName');
+    equal(job.items.at(0).get('name'), 'Sub1');
+    equal(job.items.length, 2);
+    equal(job.items.get(1).subItems.get(1).get('subName'), 'One');
+    equal(job.items.get(2).subItems.get(3).get('subName'), 'Three');
+    job.set(job.parse(newData, {parse: true}));
+    equal(job.get('name'), 'NewJobName');
+    equal(job.items.at(0).get('name'), 'NewSub1');
+    equal(job.items.length, 2);
+    equal(job.items.get(1).subItems.get(1).get('subName'), 'NewOne');
+    equal(job.items.get(2).subItems.get(3).get('subName'), 'NewThree');
+  });
+
+})();
diff --git a/bower_components/backbone/test/environment.js b/bower_components/backbone/test/environment.js
index 54aa2c40..996884bb 100644
--- a/bower_components/backbone/test/environment.js
+++ b/bower_components/backbone/test/environment.js
@@ -1,45 +1,35 @@
 (function() {
 
-  var Environment = this.Environment = function(){};
-
-  _.extend(Environment.prototype, {
-
-    ajax: Backbone.ajax,
-
-    sync: Backbone.sync,
-
-    emulateHTTP: Backbone.emulateHTTP,
-
-    emulateJSON: Backbone.emulateJSON,
-
-    setup: function() {
-      var env = this;
-
-      // Capture ajax settings for comparison.
-      Backbone.ajax = function(settings) {
-        env.ajaxSettings = settings;
+  var sync = Backbone.sync;
+  var ajax = Backbone.ajax;
+  var emulateHTTP = Backbone.emulateHTTP;
+  var emulateJSON = Backbone.emulateJSON;
+
+  QUnit.testStart(function() {
+    var env = this.config.current.testEnvironment;
+
+    // Capture ajax settings for comparison.
+    Backbone.ajax = function(settings) {
+      env.ajaxSettings = settings;
+    };
+
+    // Capture the arguments to Backbone.sync for comparison.
+    Backbone.sync = function(method, model, options) {
+      env.syncArgs = {
+        method: method,
+        model: model,
+        options: options
       };
+      sync.apply(this, arguments);
+    };
 
-      // Capture the arguments to Backbone.sync for comparison.
-      Backbone.sync = function(method, model, options) {
-        env.syncArgs = {
-          method: method,
-          model: model,
-          options: options
-        };
-        env.sync.apply(this, arguments);
-      };
-    },
-
-    teardown: function() {
-      this.syncArgs = null;
-      this.ajaxSettings = null;
-      Backbone.sync = this.sync;
-      Backbone.ajax = this.ajax;
-      Backbone.emulateHTTP = this.emulateHTTP;
-      Backbone.emulateJSON = this.emulateJSON;
-    }
+  });
 
+  QUnit.testDone(function() {
+    Backbone.sync = sync;
+    Backbone.ajax = ajax;
+    Backbone.emulateHTTP = emulateHTTP;
+    Backbone.emulateJSON = emulateJSON;
   });
 
 })();
diff --git a/bower_components/backbone/test/events.js b/bower_components/backbone/test/events.js
index 1aa746cc..9f6878e4 100644
--- a/bower_components/backbone/test/events.js
+++ b/bower_components/backbone/test/events.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   module("Backbone.Events");
 
@@ -152,6 +152,31 @@ $(document).ready(function() {
     e.trigger("foo");
   });
 
+  test("stopListening cleans up references", 4, function() {
+    var a = _.extend({}, Backbone.Events);
+    var b = _.extend({}, Backbone.Events);
+    var fn = function() {};
+    a.listenTo(b, 'all', fn).stopListening();
+    equal(_.size(a._listeningTo), 0);
+    a.listenTo(b, 'all', fn).stopListening(b);
+    equal(_.size(a._listeningTo), 0);
+    a.listenTo(b, 'all', fn).stopListening(null, 'all');
+    equal(_.size(a._listeningTo), 0);
+    a.listenTo(b, 'all', fn).stopListening(null, null, fn);
+    equal(_.size(a._listeningTo), 0);
+  });
+
+  test("listenTo and stopListening cleaning up references", 2, function() {
+    var a = _.extend({}, Backbone.Events);
+    var b = _.extend({}, Backbone.Events);
+    a.listenTo(b, 'all', function(){ ok(true); });
+    b.trigger('anything');
+    a.listenTo(b, 'other', function(){ ok(false); });
+    a.stopListening(b, 'other');
+    a.stopListening(b, 'all');
+    equal(_.keys(a._listeningTo).length, 0);
+  });
+
   test("listenTo with empty callback doesn't throw an error", 1, function(){
     var e = _.extend({}, Backbone.Events);
     e.listenTo(e, "foo", null);
@@ -449,4 +474,4 @@ $(document).ready(function() {
     equal(obj, obj.stopListening());
   });
 
-});
+})();
diff --git a/bower_components/backbone/test/index.html b/bower_components/backbone/test/index.html
index 1f57708c..46f28f67 100644
--- a/bower_components/backbone/test/index.html
+++ b/bower_components/backbone/test/index.html
@@ -4,6 +4,15 @@
   <meta charset='utf8'>
   <title>Backbone Test Suite</title>
   <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen">
+  <link rel="icon" href="../docs/images/favicon.ico">
+</head>
+<body>
+  <div id="qunit"></div>
+  <div id="qunit-fixture">
+    <div id='testElement'>
+      <h1>Test</h1>
+    </div>
+  </div>
   <script src="vendor/json2.js"></script>
   <script src="vendor/jquery.js"></script>
   <script src="vendor/qunit.js"></script>
@@ -17,13 +26,5 @@
   <script src="router.js"></script>
   <script src="view.js"></script>
   <script src="sync.js"></script>
-</head>
-<body>
-  <div id="qunit"></div>
-  <div id="qunit-fixture">
-    <div id='testElement'>
-      <h1>Test</h1>
-    </div>
-  </div>
 </body>
 </html>
diff --git a/bower_components/backbone/test/model.js b/bower_components/backbone/test/model.js
index 3b196c48..ec1ba54a 100644
--- a/bower_components/backbone/test/model.js
+++ b/bower_components/backbone/test/model.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   var proxy = Backbone.Model.extend();
   var klass = Backbone.Collection.extend({
@@ -6,10 +6,9 @@ $(document).ready(function() {
   });
   var doc, collection;
 
-  module("Backbone.Model", _.extend(new Environment, {
+  module("Backbone.Model", {
 
     setup: function() {
-      Environment.prototype.setup.apply(this, arguments);
       doc = new proxy({
         id     : '1-the-tempest',
         title  : "The Tempest",
@@ -20,7 +19,7 @@ $(document).ready(function() {
       collection.add(doc);
     }
 
-  }));
+  });
 
   test("initialize", 3, function() {
     var Model = Backbone.Model.extend({
@@ -111,13 +110,6 @@ $(document).ready(function() {
     equal(model.url(), '/nested/1/collection/2');
   });
 
-  test('url and urlRoot are directly attached if passed in the options', 2, function () {
-    var model = new Backbone.Model({a: 1}, {url: '/test'});
-    var model2 = new Backbone.Model({a: 2}, {urlRoot: '/test2'});
-    equal(model.url, '/test');
-    equal(model2.urlRoot, '/test2');
-  });
-
   test("underscore methods", 5, function() {
     var model = new Backbone.Model({ 'foo': 'a', 'bar': 'b', 'baz': 'c' });
     var model2 = model.clone();
@@ -712,6 +704,22 @@ $(document).ready(function() {
     ok(this.syncArgs.model === model);
   });
 
+  test("save without `wait` doesn't set invalid attributes", function () {
+    var model = new Backbone.Model();
+    model.validate = function () { return 1; }
+    model.save({a: 1});
+    equal(model.get('a'), void 0);
+  });
+
+  test("save doesn't validate twice", function () {
+    var model = new Backbone.Model();
+    var times = 0;
+    model.sync = function () {};
+    model.validate = function () { ++times; }
+    model.save({});
+    equal(times, 1);
+  });
+
   test("`hasChanged` for falsey keys", 2, function() {
     var model = new Backbone.Model();
     model.set({x: true}, {silent: true});
@@ -1099,4 +1107,4 @@ $(document).ready(function() {
     model.set({a: true});
   });
 
-});
+})();
diff --git a/bower_components/backbone/test/noconflict.js b/bower_components/backbone/test/noconflict.js
index a0e55cac..ac4324d0 100644
--- a/bower_components/backbone/test/noconflict.js
+++ b/bower_components/backbone/test/noconflict.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   module("Backbone.noConflict");
 
@@ -9,4 +9,4 @@ $(document).ready(function() {
     equal(window.Backbone, noconflictBackbone, 'Backbone is still pointing to the original Backbone');
   });
 
-});
+})();
diff --git a/bower_components/backbone/test/router.js b/bower_components/backbone/test/router.js
index e6e1b3d6..296546e4 100644
--- a/bower_components/backbone/test/router.js
+++ b/bower_components/backbone/test/router.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   var router = null;
   var location = null;
@@ -75,6 +75,8 @@ $(document).ready(function() {
       "counter":                    "counter",
       "search/:query":              "search",
       "search/:query/p:page":       "search",
+      "charñ":                      "charUTF",
+      "char%C3%B1":                 "charEscaped",
       "contacts":                   "contacts",
       "contacts/new":               "newContact",
       "contacts/:id":               "loadContact",
@@ -103,11 +105,19 @@ $(document).ready(function() {
       this.count++;
     },
 
-    search : function(query, page) {
+    search: function(query, page) {
       this.query = query;
       this.page = page;
     },
 
+    charUTF: function() {
+      this.charType = 'UTF';
+    },
+
+    charEscaped: function() {
+      this.charType = 'escaped';
+    },
+
     contacts: function(){
       this.contact = 'index';
     },
@@ -204,6 +214,10 @@ $(document).ready(function() {
     equal(router.page, '20');
   });
 
+  test("reports matched route via nagivate", 1, function() {
+    ok(Backbone.history.navigate('search/manhattan/p20', true));
+  });
+
   test("route precedence via navigate", 6, function(){
     // check both 0.9.x and backwards-compatibility options
     _.each([ { trigger: true }, true ], function( options ){
@@ -349,6 +363,13 @@ $(document).ready(function() {
     equal(lastRoute, 'search');
   });
 
+  test("#2666 - Hashes with UTF8 in them.", 2, function() {
+    Backbone.history.navigate('charñ', {trigger: true});
+    equal(router.charType, 'UTF');
+    Backbone.history.navigate('char%C3%B1', {trigger: true});
+    equal(router.charType, 'escaped');
+  });
+
   test("#1185 - Use pathname when hashChange is not wanted.", 1, function() {
     Backbone.history.stop();
     location.replace('http://example.com/path/name#hash');
@@ -609,4 +630,100 @@ $(document).ready(function() {
     deepEqual({home: "root", index: "index.html", show: "show", search: "search"}, router.routes);
   });
 
-});
+  test("#2538 - hashChange to pushState only if both requested.", 0, function() {
+    Backbone.history.stop();
+    location.replace('http://example.com/root?a=b#x/y');
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(){ ok(false); }
+      }
+    });
+    Backbone.history.start({
+      root: 'root',
+      pushState: true,
+      hashChange: false
+    });
+  });
+
+  test('No hash fallback.', 0, function() {
+    Backbone.history.stop();
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(){},
+        replaceState: function(){}
+      }
+    });
+
+    var Router = Backbone.Router.extend({
+      routes: {
+        hash: function() { ok(false); }
+      }
+    });
+    var router = new Router;
+
+    location.replace('http://example.com/');
+    Backbone.history.start({
+      pushState: true,
+      hashChange: false
+    });
+    location.replace('http://example.com/nomatch#hash');
+    Backbone.history.checkUrl();
+  });
+
+  test('#2656 - No trailing slash on root.', 1, function() {
+    Backbone.history.stop();
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url){
+          strictEqual(url, '/root');
+        }
+      }
+    });
+    location.replace('http://example.com/root/path');
+    Backbone.history.start({pushState: true, root: 'root'});
+    Backbone.history.navigate('');
+  });
+
+  test('#2656 - No trailing slash on root.', 1, function() {
+    Backbone.history.stop();
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url) {
+          strictEqual(url, '/');
+        }
+      }
+    });
+    location.replace('http://example.com/path');
+    Backbone.history.start({pushState: true});
+    Backbone.history.navigate('');
+  });
+
+  test('#2765 - Fragment matching sans query/hash.', 2, function() {
+    Backbone.history.stop();
+    Backbone.history = _.extend(new Backbone.History, {
+      location: location,
+      history: {
+        pushState: function(state, title, url) {
+          strictEqual(url, '/path?query#hash');
+        }
+      }
+    });
+
+    var Router = Backbone.Router.extend({
+      routes: {
+        path: function() { ok(true); }
+      }
+    });
+    var router = new Router;
+
+    location.replace('http://example.com/');
+    Backbone.history.start({pushState: true});
+    Backbone.history.navigate('path?query#hash', true);
+  });
+
+})();
diff --git a/bower_components/backbone/test/sync.js b/bower_components/backbone/test/sync.js
index 8fddb47f..d54a7963 100644
--- a/bower_components/backbone/test/sync.js
+++ b/bower_components/backbone/test/sync.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   var Library = Backbone.Collection.extend({
     url : function() { return '/library'; }
@@ -11,20 +11,18 @@ $(document).ready(function() {
     length : 123
   };
 
-  module("Backbone.sync", _.extend(new Environment, {
+  module("Backbone.sync", {
 
     setup : function() {
-      Environment.prototype.setup.apply(this, arguments);
       library = new Library;
       library.create(attrs, {wait: false});
     },
 
     teardown: function() {
-      Environment.prototype.teardown.apply(this, arguments);
       Backbone.emulateHTTP = false;
     }
 
-  }));
+  });
 
   test("read", 4, function() {
     library.fetch();
@@ -209,4 +207,4 @@ $(document).ready(function() {
     strictEqual(this.ajaxSettings.beforeSend(xhr), false);
   });
 
-});
+})();
diff --git a/bower_components/backbone/test/vendor/qunit.css b/bower_components/backbone/test/vendor/qunit.css
index d7fc0c8e..7ba3f9a3 100755
--- a/bower_components/backbone/test/vendor/qunit.css
+++ b/bower_components/backbone/test/vendor/qunit.css
@@ -1,5 +1,5 @@
 /**
- * QUnit v1.11.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *
diff --git a/bower_components/backbone/test/vendor/qunit.js b/bower_components/backbone/test/vendor/qunit.js
index 302545f4..84c73907 100755
--- a/bower_components/backbone/test/vendor/qunit.js
+++ b/bower_components/backbone/test/vendor/qunit.js
@@ -1,11 +1,11 @@
 /**
- * QUnit v1.11.0 - A JavaScript Unit Testing Framework
+ * QUnit v1.12.0 - A JavaScript Unit Testing Framework
  *
  * http://qunitjs.com
  *
- * Copyright 2012 jQuery Foundation and other contributors
+ * Copyright 2013 jQuery Foundation and other contributors
  * Released under the MIT license.
- * http://jquery.org/license
+ * https://jquery.org/license/
  */
 
 (function( window ) {
@@ -20,6 +20,7 @@ var QUnit,
 	hasOwn = Object.prototype.hasOwnProperty,
 	// Keep a local reference to Date (GH-283)
 	Date = window.Date,
+	setTimeout = window.setTimeout,
 	defined = {
 		setTimeout: typeof window.setTimeout !== "undefined",
 		sessionStorage: (function() {
@@ -115,8 +116,16 @@ Test.prototype = {
 		}
 	},
 	setup: function() {
-		if ( this.module !== config.previousModule ) {
-			if ( config.previousModule ) {
+		if (
+			// Emit moduleStart when we're switching from one module to another
+			this.module !== config.previousModule ||
+				// They could be equal (both undefined) but if the previousModule property doesn't
+				// yet exist it means this is the first test in a suite that isn't wrapped in a
+				// module, in which case we'll just emit a moduleStart event for 'undefined'.
+				// Without this, reporters can get testStart before moduleStart  which is a problem.
+				!hasOwn.call( config, "previousModule" )
+		) {
+			if ( hasOwn.call( config, "previousModule" ) ) {
 				runLoggingCallbacks( "moduleDone", QUnit, {
 					name: config.previousModule,
 					failed: config.moduleStats.bad,
@@ -129,10 +138,6 @@ Test.prototype = {
 			runLoggingCallbacks( "moduleStart", QUnit, {
 				name: this.module
 			});
-		} else if ( config.autorun ) {
-			runLoggingCallbacks( "moduleStart", QUnit, {
-				name: this.module
-			});
 		}
 
 		config.current = this;
@@ -148,19 +153,27 @@ Test.prototype = {
 			module: this.module
 		});
 
-		// allow utility functions to access the current test environment
-		// TODO why??
+		/*jshint camelcase:false */
+
+
+		/**
+		 * Expose the current test environment.
+		 *
+		 * @deprecated since 1.12.0: Use QUnit.config.current.testEnvironment instead.
+		 */
 		QUnit.current_testEnvironment = this.testEnvironment;
 
+		/*jshint camelcase:true */
+
 		if ( !config.pollution ) {
 			saveGlobal();
 		}
 		if ( config.notrycatch ) {
-			this.testEnvironment.setup.call( this.testEnvironment );
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
 			return;
 		}
 		try {
-			this.testEnvironment.setup.call( this.testEnvironment );
+			this.testEnvironment.setup.call( this.testEnvironment, QUnit.assert );
 		} catch( e ) {
 			QUnit.pushFailure( "Setup failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
 		}
@@ -208,11 +221,11 @@ Test.prototype = {
 			if ( typeof this.callbackRuntime === "undefined" ) {
 				this.callbackRuntime = +new Date() - this.callbackStarted;
 			}
-			this.testEnvironment.teardown.call( this.testEnvironment );
+			this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
 			return;
 		} else {
 			try {
-				this.testEnvironment.teardown.call( this.testEnvironment );
+				this.testEnvironment.teardown.call( this.testEnvironment, QUnit.assert );
 			} catch( e ) {
 				QUnit.pushFailure( "Teardown failed on " + this.testName + ": " + ( e.message || e ), extractStacktrace( e, 1 ) );
 			}
@@ -419,7 +432,7 @@ QUnit = {
 		test.queue();
 	},
 
-	// Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	// Specify the number of expected assertions to guarantee that failed test (no assertions are run at all) don't slip through.
 	expect: function( asserts ) {
 		if (arguments.length === 1) {
 			config.current.expected = asserts;
@@ -454,7 +467,7 @@ QUnit = {
 		}
 		// A slight delay, to avoid any current callbacks
 		if ( defined.setTimeout ) {
-			window.setTimeout(function() {
+			setTimeout(function() {
 				if ( config.semaphore > 0 ) {
 					return;
 				}
@@ -477,7 +490,7 @@ QUnit = {
 
 		if ( config.testTimeout && defined.setTimeout ) {
 			clearTimeout( config.timeout );
-			config.timeout = window.setTimeout(function() {
+			config.timeout = setTimeout(function() {
 				QUnit.ok( false, "Test timed out" );
 				config.semaphore = 1;
 				QUnit.start();
@@ -487,7 +500,7 @@ QUnit = {
 };
 
 // `assert` initialized at top of scope
-// Asssert helpers
+// Assert helpers
 // All of these must either call QUnit.push() or manually do:
 // - runLoggingCallbacks( "log", .. );
 // - config.current.assertions.push({ .. });
@@ -505,6 +518,7 @@ assert = {
 			throw new Error( "ok() assertion outside test context, was " + sourceFromStacktrace(2) );
 		}
 		result = !!result;
+		msg = msg || (result ? "okay" : "failed" );
 
 		var source,
 			details = {
@@ -514,8 +528,7 @@ assert = {
 				message: msg
 			};
 
-		msg = escapeText( msg || (result ? "okay" : "failed" ) );
-		msg = "<span class='test-message'>" + msg + "</span>";
+		msg = "<span class='test-message'>" + escapeText( msg ) + "</span>";
 
 		if ( !result ) {
 			source = sourceFromStacktrace( 2 );
@@ -642,13 +655,13 @@ assert = {
 
 			QUnit.push( ok, actual, expectedOutput, message );
 		} else {
-			QUnit.pushFailure( message, null, 'No exception was thrown.' );
+			QUnit.pushFailure( message, null, "No exception was thrown." );
 		}
 	}
 };
 
 /**
- * @deprecate since 1.8.0
+ * @deprecated since 1.8.0
  * Kept assertion helpers in root for backwards compatibility.
  */
 extend( QUnit, assert );
@@ -737,7 +750,7 @@ config = {
 // Export global variables, unless an 'exports' object exists,
 // in that case we assume we're in CommonJS (dealt with on the bottom of the script)
 if ( typeof exports === "undefined" ) {
-	extend( window, QUnit );
+	extend( window, QUnit.constructor.prototype );
 
 	// Expose QUnit object
 	window.QUnit = QUnit;
@@ -836,6 +849,11 @@ extend( QUnit, {
 	},
 
 	// Resets the test setup. Useful for tests that modify the DOM.
+	/*
+	DEPRECATED: Use multiple tests instead of resetting inside a test.
+	Use testStart or testDone for custom cleanup.
+	This method will throw an error in 2.0, and will be removed in 2.1
+	*/
 	reset: function() {
 		var fixture = id( "qunit-fixture" );
 		if ( fixture ) {
@@ -985,11 +1003,10 @@ extend( QUnit, {
 			querystring = "?";
 
 		for ( key in params ) {
-			if ( !hasOwn.call( params, key ) ) {
-				continue;
+			if ( hasOwn.call( params, key ) ) {
+				querystring += encodeURIComponent( key ) + "=" +
+					encodeURIComponent( params[ key ] ) + "&";
 			}
-			querystring += encodeURIComponent( key ) + "=" +
-				encodeURIComponent( params[ key ] ) + "&";
 		}
 		return window.location.protocol + "//" + window.location.host +
 			window.location.pathname + querystring.slice( 0, -1 );
@@ -997,7 +1014,10 @@ extend( QUnit, {
 
 	extend: extend,
 	id: id,
-	addEvent: addEvent
+	addEvent: addEvent,
+	addClass: addClass,
+	hasClass: hasClass,
+	removeClass: removeClass
 	// load, equiv, jsDump, diff: Attached later
 });
 
@@ -1044,6 +1064,7 @@ QUnit.load = function() {
 	var banner, filter, i, label, len, main, ol, toolbar, userAgent, val,
 		urlConfigCheckboxesContainer, urlConfigCheckboxes, moduleFilter,
 		numModules = 0,
+		moduleNames = [],
 		moduleFilterHtml = "",
 		urlConfigHtml = "",
 		oldconfig = extend( {}, config );
@@ -1072,18 +1093,24 @@ QUnit.load = function() {
 			"'><label for='qunit-urlconfig-" + escapeText( val.id ) +
 			"' title='" + escapeText( val.tooltip ) + "'>" + val.label + "</label>";
 	}
-
+	for ( i in config.modules ) {
+		if ( config.modules.hasOwnProperty( i ) ) {
+			moduleNames.push(i);
+		}
+	}
+	numModules = moduleNames.length;
+	moduleNames.sort( function( a, b ) {
+		return a.localeCompare( b );
+	});
 	moduleFilterHtml += "<label for='qunit-modulefilter'>Module: </label><select id='qunit-modulefilter' name='modulefilter'><option value='' " +
 		( config.module === undefined  ? "selected='selected'" : "" ) +
 		">< All Modules ></option>";
 
-	for ( i in config.modules ) {
-		if ( config.modules.hasOwnProperty( i ) ) {
-			numModules += 1;
-			moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(i) ) + "' " +
-				( config.module === i ? "selected='selected'" : "" ) +
-				">" + escapeText(i) + "</option>";
-		}
+
+	for ( i = 0; i < numModules; i++) {
+			moduleFilterHtml += "<option value='" + escapeText( encodeURIComponent(moduleNames[i]) ) + "' " +
+				( config.module === moduleNames[i] ? "selected='selected'" : "" ) +
+				">" + escapeText(moduleNames[i]) + "</option>";
 	}
 	moduleFilterHtml += "</select>";
 
@@ -1137,7 +1164,7 @@ QUnit.load = function() {
 		// `label` initialized at top of scope
 		label = document.createElement( "label" );
 		label.setAttribute( "for", "qunit-filter-pass" );
-		label.setAttribute( "title", "Only show tests and assertons that fail. Stored in sessionStorage." );
+		label.setAttribute( "title", "Only show tests and assertions that fail. Stored in sessionStorage." );
 		label.innerHTML = "Hide passed tests";
 		toolbar.appendChild( label );
 
@@ -1157,14 +1184,19 @@ QUnit.load = function() {
 		toolbar.appendChild( urlConfigCheckboxesContainer );
 
 		if (numModules > 1) {
-			moduleFilter = document.createElement( 'span' );
-			moduleFilter.setAttribute( 'id', 'qunit-modulefilter-container' );
+			moduleFilter = document.createElement( "span" );
+			moduleFilter.setAttribute( "id", "qunit-modulefilter-container" );
 			moduleFilter.innerHTML = moduleFilterHtml;
 			addEvent( moduleFilter.lastChild, "change", function() {
 				var selectBox = moduleFilter.getElementsByTagName("select")[0],
 					selectedModule = decodeURIComponent(selectBox.options[selectBox.selectedIndex].value);
 
-				window.location = QUnit.url( { module: ( selectedModule === "" ) ? undefined : selectedModule } );
+				window.location = QUnit.url({
+					module: ( selectedModule === "" ) ? undefined : selectedModule,
+					// Remove any existing filters
+					filter: undefined,
+					testNumber: undefined
+				});
 			});
 			toolbar.appendChild(moduleFilter);
 		}
@@ -1188,7 +1220,7 @@ addEvent( window, "load", QUnit.load );
 onErrorFnPrev = window.onerror;
 
 // Cover uncaught exceptions
-// Returning true will surpress the default browser handler,
+// Returning true will suppress the default browser handler,
 // returning false will let it run.
 window.onerror = function ( error, filePath, linerNr ) {
 	var ret = false;
@@ -1197,7 +1229,7 @@ window.onerror = function ( error, filePath, linerNr ) {
 	}
 
 	// Treat return value as window.onerror itself does,
-	// Only do our handling if not surpressed.
+	// Only do our handling if not suppressed.
 	if ( ret !== true ) {
 		if ( QUnit.config.current ) {
 			if ( QUnit.config.current.ignoreGlobalErrors ) {
@@ -1227,6 +1259,7 @@ function done() {
 			total: config.moduleStats.all
 		});
 	}
+	delete config.previousModule;
 
 	var i, key,
 		banner = id( "qunit-banner" ),
@@ -1386,16 +1419,16 @@ function escapeText( s ) {
 	// Both single quotes and double quotes (for attributes)
 	return s.replace( /['"<>&]/g, function( s ) {
 		switch( s ) {
-			case '\'':
-				return '&#039;';
-			case '"':
-				return '&quot;';
-			case '<':
-				return '&lt;';
-			case '>':
-				return '&gt;';
-			case '&':
-				return '&amp;';
+			case "'":
+				return "&#039;";
+			case "\"":
+				return "&quot;";
+			case "<":
+				return "&lt;";
+			case ">":
+				return "&gt;";
+			case "&":
+				return "&amp;";
 		}
 	});
 }
@@ -1419,7 +1452,7 @@ function process( last ) {
 		if ( !defined.setTimeout || config.updateRate <= 0 || ( ( new Date().getTime() - start ) < config.updateRate ) ) {
 			config.queue.shift()();
 		} else {
-			window.setTimeout( next, 13 );
+			setTimeout( next, 13 );
 			break;
 		}
 	}
@@ -1434,11 +1467,13 @@ function saveGlobal() {
 
 	if ( config.noglobals ) {
 		for ( var key in window ) {
-			// in Opera sometimes DOM element ids show up here, ignore them
-			if ( !hasOwn.call( window, key ) || /^qunit-test-output/.test( key ) ) {
-				continue;
+			if ( hasOwn.call( window, key ) ) {
+				// in Opera sometimes DOM element ids show up here, ignore them
+				if ( /^qunit-test-output/.test( key ) ) {
+					continue;
+				}
+				config.pollution.push( key );
 			}
-			config.pollution.push( key );
 		}
 	}
 }
@@ -1480,12 +1515,15 @@ function diff( a, b ) {
 
 function extend( a, b ) {
 	for ( var prop in b ) {
-		if ( b[ prop ] === undefined ) {
-			delete a[ prop ];
-
-		// Avoid "Member not found" error in IE8 caused by setting window.constructor
-		} else if ( prop !== "constructor" || a !== window ) {
-			a[ prop ] = b[ prop ];
+		if ( hasOwn.call( b, prop ) ) {
+			// Avoid "Member not found" error in IE8 caused by messing with window.constructor
+			if ( !( prop === "constructor" && a === window ) ) {
+				if ( b[ prop ] === undefined ) {
+					delete a[ prop ];
+				} else {
+					a[ prop ] = b[ prop ];
+				}
+			}
 		}
 	}
 
@@ -1535,8 +1573,8 @@ function removeClass( elem, name ) {
 	while ( set.indexOf(" " + name + " ") > -1 ) {
 		set = set.replace(" " + name + " " , " ");
 	}
-	// If possible, trim it for prettiness, but not neccecarily
-	elem.className = window.jQuery ? jQuery.trim( set ) : ( set.trim ? set.trim() : set );
+	// If possible, trim it for prettiness, but not necessarily
+	elem.className = typeof set.trim === "function" ? set.trim() : set.replace(/^\s+|\s+$/g, "");
 }
 
 function id( name ) {
@@ -1585,8 +1623,10 @@ QUnit.equiv = (function() {
 		callers = [],
 		// stack to avoiding loops from circular referencing
 		parents = [],
+		parentsB = [],
 
 		getProto = Object.getPrototypeOf || function ( obj ) {
+			/*jshint camelcase:false */
 			return obj.__proto__;
 		},
 		callbacks = (function () {
@@ -1595,7 +1635,7 @@ QUnit.equiv = (function() {
 			function useStrictEquality( b, a ) {
 				/*jshint eqeqeq:false */
 				if ( b instanceof a.constructor || a instanceof b.constructor ) {
-					// to catch short annotaion VS 'new' annotation of a
+					// to catch short annotation VS 'new' annotation of a
 					// declaration
 					// e.g. var i = 1;
 					// var j = new Number(1);
@@ -1624,7 +1664,7 @@ QUnit.equiv = (function() {
 					return QUnit.objectType( b ) === "regexp" &&
 						// the regex itself
 						a.source === b.source &&
-						// and its modifers
+						// and its modifiers
 						a.global === b.global &&
 						// (gmi) ...
 						a.ignoreCase === b.ignoreCase &&
@@ -1641,7 +1681,7 @@ QUnit.equiv = (function() {
 				},
 
 				"array": function( b, a ) {
-					var i, j, len, loop;
+					var i, j, len, loop, aCircular, bCircular;
 
 					// b could be an object literal here
 					if ( QUnit.objectType( b ) !== "array" ) {
@@ -1656,24 +1696,36 @@ QUnit.equiv = (function() {
 
 					// track reference to avoid circular references
 					parents.push( a );
+					parentsB.push( b );
 					for ( i = 0; i < len; i++ ) {
 						loop = false;
 						for ( j = 0; j < parents.length; j++ ) {
-							if ( parents[j] === a[i] ) {
-								loop = true;// dont rewalk array
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									parents.pop();
+									parentsB.pop();
+									return false;
+								}
 							}
 						}
 						if ( !loop && !innerEquiv(a[i], b[i]) ) {
 							parents.pop();
+							parentsB.pop();
 							return false;
 						}
 					}
 					parents.pop();
+					parentsB.pop();
 					return true;
 				},
 
 				"object": function( b, a ) {
-					var i, j, loop,
+					/*jshint forin:false */
+					var i, j, loop, aCircular, bCircular,
 						// Default to true
 						eq = true,
 						aProperties = [],
@@ -1692,28 +1744,36 @@ QUnit.equiv = (function() {
 
 					// stack constructor before traversing properties
 					callers.push( a.constructor );
+
 					// track reference to avoid circular references
 					parents.push( a );
+					parentsB.push( b );
 
-					for ( i in a ) { // be strict: don't ensures hasOwnProperty
-									// and go deep
+					// be strict: don't ensure hasOwnProperty and go deep
+					for ( i in a ) {
 						loop = false;
 						for ( j = 0; j < parents.length; j++ ) {
-							if ( parents[j] === a[i] ) {
-								// don't go down the same path twice
-								loop = true;
+							aCircular = parents[j] === a[i];
+							bCircular = parentsB[j] === b[i];
+							if ( aCircular || bCircular ) {
+								if ( a[i] === b[i] || aCircular && bCircular ) {
+									loop = true;
+								} else {
+									eq = false;
+									break;
+								}
 							}
 						}
-						aProperties.push(i); // collect a's properties
-
-						if (!loop && !innerEquiv( a[i], b[i] ) ) {
+						aProperties.push(i);
+						if ( !loop && !innerEquiv(a[i], b[i]) ) {
 							eq = false;
 							break;
 						}
 					}
 
-					callers.pop(); // unstack, we are done
 					parents.pop();
+					parentsB.pop();
+					callers.pop(); // unstack, we are done
 
 					for ( i in b ) {
 						bProperties.push( i ); // collect b's properties
@@ -1743,7 +1803,7 @@ QUnit.equiv = (function() {
 			}
 
 			// apply transition with (1..n) arguments
-		}( args[0], args[1] ) && arguments.callee.apply( this, args.splice(1, args.length - 1 )) );
+		}( args[0], args[1] ) && innerEquiv.apply( this, args.splice(1, args.length - 1 )) );
 	};
 
 	return innerEquiv;
@@ -1761,7 +1821,7 @@ QUnit.equiv = (function() {
  */
 QUnit.jsDump = (function() {
 	function quote( str ) {
-		return '"' + str.toString().replace( /"/g, '\\"' ) + '"';
+		return "\"" + str.toString().replace( /"/g, "\\\"" ) + "\"";
 	}
 	function literal( o ) {
 		return o + "";
@@ -1854,13 +1914,13 @@ QUnit.jsDump = (function() {
 				if ( this.HTML ) {
 					chr = chr.replace( /\t/g, "   " ).replace( / /g, "&nbsp;" );
 				}
-				return new Array( this._depth_ + (extra||0) ).join(chr);
+				return new Array( this.depth + ( extra || 0 ) ).join(chr);
 			},
 			up: function( a ) {
-				this._depth_ += a || 1;
+				this.depth += a || 1;
 			},
 			down: function( a ) {
-				this._depth_ -= a || 1;
+				this.depth -= a || 1;
 			},
 			setParser: function( name, parser ) {
 				this.parsers[name] = parser;
@@ -1870,7 +1930,7 @@ QUnit.jsDump = (function() {
 			literal: literal,
 			join: join,
 			//
-			_depth_: 1,
+			depth: 1,
 			// This is the list of parsers, to modify them, use jsDump.setParser
 			parsers: {
 				window: "[Window]",
@@ -1898,6 +1958,7 @@ QUnit.jsDump = (function() {
 				nodelist: array,
 				"arguments": array,
 				object: function( map, stack ) {
+					/*jshint forin:false */
 					var ret = [ ], keys, key, val, i;
 					QUnit.jsDump.up();
 					keys = [];
@@ -2036,18 +2097,17 @@ QUnit.diff = (function() {
 		}
 
 		for ( i in ns ) {
-			if ( !hasOwn.call( ns, i ) ) {
-				continue;
-			}
-			if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
-				n[ ns[i].rows[0] ] = {
-					text: n[ ns[i].rows[0] ],
-					row: os[i].rows[0]
-				};
-				o[ os[i].rows[0] ] = {
-					text: o[ os[i].rows[0] ],
-					row: ns[i].rows[0]
-				};
+			if ( hasOwn.call( ns, i ) ) {
+				if ( ns[i].rows.length === 1 && hasOwn.call( os, i ) && os[i].rows.length === 1 ) {
+					n[ ns[i].rows[0] ] = {
+						text: n[ ns[i].rows[0] ],
+						row: os[i].rows[0]
+					};
+					o[ os[i].rows[0] ] = {
+						text: o[ os[i].rows[0] ],
+						row: ns[i].rows[0]
+					};
+				}
 			}
 		}
 
@@ -2143,9 +2203,9 @@ QUnit.diff = (function() {
 	};
 }());
 
-// for CommonJS enviroments, export everything
+// for CommonJS environments, export everything
 if ( typeof exports !== "undefined" ) {
-	extend( exports, QUnit );
+	extend( exports, QUnit.constructor.prototype );
 }
 
 // get at whatever the global object is, like window in browsers
diff --git a/bower_components/backbone/test/view.js b/bower_components/backbone/test/view.js
index 58a87718..65eee25d 100644
--- a/bower_components/backbone/test/view.js
+++ b/bower_components/backbone/test/view.js
@@ -1,4 +1,4 @@
-$(document).ready(function() {
+(function() {
 
   var view;
 
@@ -14,13 +14,10 @@ $(document).ready(function() {
 
   });
 
-  test("constructor", 6, function() {
+  test("constructor", 3, function() {
     equal(view.el.id, 'test-view');
     equal(view.el.className, 'test-view');
     equal(view.el.other, void 0);
-    equal(view.options.id, 'test-view');
-    equal(view.options.className, 'test-view');
-    equal(view.options.other, 'non-special-option');
   });
 
   test("jQuery", 1, function() {
@@ -156,30 +153,6 @@ $(document).ready(function() {
     strictEqual(new View().el.id, 'id');
   });
 
-  test("with options function", 3, function() {
-    var View1 = Backbone.View.extend({
-      options: function() {
-        return {
-          title: 'title1',
-          acceptText: 'confirm'
-        };
-      }
-    });
-
-    var View2 = View1.extend({
-      options: function() {
-        return _.extend(View1.prototype.options.call(this), {
-          title: 'title2',
-          fixed: true
-        });
-      }
-    });
-
-    strictEqual(new View2().options.title, 'title2');
-    strictEqual(new View2().options.acceptText, 'confirm');
-    strictEqual(new View2().options.fixed, true);
-  });
-
   test("with attributes", 2, function() {
     var View = Backbone.View.extend({
       attributes: {
@@ -319,7 +292,7 @@ $(document).ready(function() {
     view.collection.trigger('x');
   });
 
-  test("Provide function for el.", 1, function() {
+  test("Provide function for el.", 2, function() {
     var View = Backbone.View.extend({
       el: function() {
         return "<p><a></a></p>";
@@ -327,7 +300,8 @@ $(document).ready(function() {
     });
 
     var view = new View;
-    ok(view.$el.is('p:has(a)'));
+    ok(view.$el.is('p'));
+    ok(view.$el.has('a'));
   });
 
   test("events passed in options", 2, function() {
@@ -354,4 +328,4 @@ $(document).ready(function() {
     equal(counter, 4);
   });
 
-});
+})();
diff --git a/bower_components/font-awesome/.bower.json b/bower_components/font-awesome/.bower.json
index 114df83e..db0dfa74 100644
--- a/bower_components/font-awesome/.bower.json
+++ b/bower_components/font-awesome/.bower.json
@@ -9,6 +9,6 @@
     "commit": "8d6f493a347c6408f47b8526bf815fecdb0d827a"
   },
   "_source": "git://github.com/FortAwesome/Font-Awesome.git",
-  "_target": "*",
+  "_target": "~3.2.1",
   "_originalSource": "font-awesome"
 }
\ No newline at end of file
diff --git a/bower_components/jquery-ui/.bower.json b/bower_components/jquery-ui/.bower.json
index 8d512100..1cadc07c 100644
--- a/bower_components/jquery-ui/.bower.json
+++ b/bower_components/jquery-ui/.bower.json
@@ -15,6 +15,6 @@
     "commit": "19487fec75762284c5c284b8ad8936d4e5d265f4"
   },
   "_source": "git://github.com/components/jqueryui.git",
-  "_target": "*",
+  "_target": "~1.10.3",
   "_originalSource": "jquery-ui"
 }
\ No newline at end of file
diff --git a/bower_components/rivets/.bower.json b/bower_components/rivets/.bower.json
index 33534d1f..86577ae0 100644
--- a/bower_components/rivets/.bower.json
+++ b/bower_components/rivets/.bower.json
@@ -9,6 +9,6 @@
     "commit": "6379f3ad490d7c51425e7220ede1c08e60780e2a"
   },
   "_source": "git://github.com/mikeric/rivets.git",
-  "_target": "*",
+  "_target": "~0.5.13",
   "_originalSource": "rivets"
 }
\ No newline at end of file
diff --git a/bower_components/underscore/.bower.json b/bower_components/underscore/.bower.json
index fb1422a9..37b7cb4b 100644
--- a/bower_components/underscore/.bower.json
+++ b/bower_components/underscore/.bower.json
@@ -9,6 +9,6 @@
     "commit": "101c10a60019fe870d21868835f65c25d64968fc"
   },
   "_source": "git://github.com/jashkenas/underscore.git",
-  "_target": "*",
+  "_target": "~1.5.2",
   "_originalSource": "underscore"
 }
\ No newline at end of file
diff --git a/coffee/main.coffee b/coffee/main.coffee
index e39f523d..be59ba76 100644
--- a/coffee/main.coffee
+++ b/coffee/main.coffee
@@ -86,8 +86,8 @@ class Formbuilder
         'click .js-duplicate': 'duplicate'
         'click .js-clear': 'clear'
 
-      initialize: ->
-        @parentView = @options.parentView
+      initialize: (options) ->
+        {@parentView} = options
         @listenTo @model, "change", @render
         @listenTo @model, "destroy", @remove
 
@@ -119,7 +119,8 @@ class Formbuilder
         'click .js-default-updated': 'defaultUpdated'
         'input .option-label-input': 'forceRender'
 
-      initialize: ->
+      initialize: (options) ->
+        {@parentView} = options
         @listenTo @model, "destroy", @remove
 
       render: ->
@@ -128,8 +129,8 @@ class Formbuilder
         return @
 
       remove: ->
-        @options.parentView.editView = undefined
-        @options.parentView.$el.find("[data-target=\"#addField\"]").click()
+        @parentView.editView = undefined
+        @parentView.$el.find("[data-target=\"#addField\"]").click()
         Backbone.View.prototype.remove.call(@)
 
       # @todo this should really be on the model, not the view
@@ -175,9 +176,12 @@ class Formbuilder
         'click .fb-tabs a': 'showTab'
         'click .fb-add-field-types a': 'addField'
 
-      initialize: ->
-        @$el = $(@options.selector)
-        @formBuilder = @options.formBuilder
+      initialize: (options) ->
+        {selector, @formBuilder, @bootstrapData} = options
+
+        # This is a terrible idea because it's not scoped to this view.
+        if selector?
+          @setElement $(selector)
 
         # Create the collection, and bind the appropriate events
         @collection = new Formbuilder.collection
@@ -188,7 +192,7 @@ class Formbuilder
         @collection.bind 'destroy', @ensureEditViewScrolled, @
 
         @render()
-        @collection.reset(@options.bootstrapData)
+        @collection.reset(@bootstrapData)
         @initAutosave()
 
       initAutosave: ->
@@ -387,13 +391,14 @@ class Formbuilder
 
             @updatingBatch = undefined
 
-  constructor: (selector, opts = {}) ->
+  constructor: (opts={}) ->
     _.extend @, Backbone.Events
-    @mainView = new Formbuilder.views.main _.extend({ selector: selector }, opts, { formBuilder: @ })
+    args = _.extend opts, {formBuilder: @}
+    @mainView = new Formbuilder.views.main args
 
 window.Formbuilder = Formbuilder
 
 if module?
   module.exports = Formbuilder
 else
-  window.Formbuilder = Formbuilder
+  window.Formbuilder = Formbuilder
\ No newline at end of file
diff --git a/dist/formbuilder-min.css b/dist/formbuilder-min.css
index edd24aa0..0247fb6d 100644
--- a/dist/formbuilder-min.css
+++ b/dist/formbuilder-min.css
@@ -1 +1 @@
-.fb-button{display:inline-block;margin:0;padding:.563rem .844rem;border:0 none;background:#16a085;color:#fff;text-align:center;text-decoration:none;font-size:12px;line-height:1.5;cursor:pointer;border-radius:.125rem;border:thin solid #19b394;border-bottom:2px solid #16a085}.fb-button[disabled]{background:#ddd!important;border:thin solid #ccc;color:#777!important;text-shadow:none!important;-ms-filter:"alpha(Opacity=65)";opacity:.65;cursor:default}.fb-clear{clear:both}.fb-main{max-width:1000px;margin:0 auto;padding:0 20px 0 0;position:relative;font-family:'Source Sans Pro','Open Sans',Tahoma}.fb-save-wrapper{position:absolute;right:20px;top:10px}.fb-left{width:320px;float:left;padding-top:30px}.fb-right{padding-top:70px;margin-left:320px;border-left:1px solid #ddd;padding-left:20px;min-height:100%;overflow:hidden}.fb-no-response-fields{color:#999}.fb-tabs{list-style:none;margin:0 0 20px;padding:0 0 0 20px;border-bottom:1px solid #ccc}.fb-tabs li{display:inline-block}.fb-tabs li a{display:block;padding:10px;border-radius:5px 5px 0 0;font-size:13px;cursor:pointer;border-left:1px solid transparent;border-right:1px solid transparent}.fb-tabs li.active a{border:1px solid #ccc;margin-bottom:-1px;border-bottom-color:#fff}.fb-tab-content .fb-tab-pane{padding:0 20px;display:none}.fb-tab-content .fb-tab-pane.active{display:block}.fb-add-field-types .section{padding-bottom:5px;margin-bottom:20px}.fb-add-field-types{font-size:0}.fb-add-field-types a{font-size:13px;display:inline-block;width:48.5%;background-color:#1abc9c;margin-bottom:9px;box-sizing:border-box}.fb-add-field-types a:nth-child(odd){margin-right:3%}.fb-add-field-types a .symbol{opacity:.6;margin:0 .25em 0 -1em}.fb-response-fields{padding-bottom:150px}.fb-response-fields a.sortable-placeholder{display:block;border:1px dashed #ddd;min-height:80px;height:80px;width:100%}.fb-field-wrapper{cursor:pointer;position:relative;margin-bottom:20px}.fb-field-wrapper input{border-radius:3px;border:thin solid #ddd}.fb-field-wrapper:hover .actions-wrapper,.fb-field-wrapper.editing .actions-wrapper{display:block}.fb-field-wrapper:hover .subtemplate-wrapper{border-color:#ddd;border-radius:3px}.fb-field-wrapper.editing{background-color:#ecf0f1;border-radius:3px}.fb-field-wrapper.editing .subtemplate-wrapper{border-color:#d9e1e3;border-style:solid;margin:0;border-radius:3px}.fb-field-wrapper .actions-wrapper{display:none;position:absolute;bottom:-7px;right:5px;z-index:3}.fb-field-wrapper .actions-wrapper a{display:inline-block;background-color:#ccc;padding:2px 8px}.edit-response-field input,.edit-response-field textarea,.edit-response-field select{border:thin solid #ddd;border-radius:.25em;padding:.5em;display:inline-block;height:auto;vertical-align:middle}.edit-response-field input:focus,.edit-response-field textarea:focus,.edit-response-field select:focus{outline:0;border:thin solid #1abc9c}.edit-response-field select{font-size:14px}.fb-field-wrapper .actions-wrapper a.js-duplicate,.fb-edit-field-wrapper .js-add-option{background-color:#2ecc71;border:0}.fb-field-wrapper .actions-wrapper a.js-clear,.fb-edit-field-wrapper .js-remove-option{background-color:#e74c3c;border:0}.fb-field-wrapper .subtemplate-wrapper{border:1px dashed transparent;margin-bottom:10px;padding:10px;position:relative}.fb-field-wrapper .subtemplate-wrapper .cover{position:absolute;top:0;left:0;height:100%;width:100%;z-index:2}.fb-field-wrapper .subtemplate-wrapper>label{display:block;border-bottom:thin solid #eee;padding-bottom:3px;margin-bottom:7px}.fb-field-wrapper .subtemplate-wrapper abbr{color:red}.fb-field-wrapper .input-line{clear:both;margin-bottom:10px}.fb-field-wrapper .input-line .above-line{margin-top:7px}.fb-field-wrapper .input-line>span{display:inline-block;vertical-align:top}.fb-field-wrapper .input-line>span input{width:100%}.fb-field-wrapper .input-line>span>label{display:block;font-size:13px;margin-left:3px}.fb-field-wrapper .help-block{display:block;font-size:12px;margin-top:5px}.fb-edit-field-wrapper{font-size:13px}.fb-edit-field-wrapper .fb-field-label{font-weight:400;background:#eee;padding:.75em;color:#666;font-size:1.25em}.fb-edit-field-wrapper .fb-field-label .field-type{margin-top:.5em;display:block;font-family:'Source Sans Pro',sans-serif;font-size:1em}.fb-edit-field-wrapper .fb-field-label .field-type:before{content:'Type: ';color:#999}.fb-edit-field-wrapper .fb-field-label .icon-arrow-right{display:none}.fb-edit-field-wrapper .fb-edit-section-header{border-bottom:1px solid #ddd;margin-top:25px;margin-bottom:10px;padding-bottom:5px;clear:both;font-weight:700}.fb-edit-field-wrapper .js-add-option,.fb-edit-field-wrapper .js-remove-option{padding:3px 6px}.fb-edit-field-wrapper .fb-bottom-add{margin-top:8px}.fb-common-wrapper .fb-label-description{margin-bottom:10px}.fb-common-wrapper .fb-label-description input,.fb-common-wrapper .fb-label-description textarea{width:100%}.fb-common-wrapper .fb-label-description textarea{min-height:5em}.response-field-draggable-helper{border:1px dashed #ddd;background:#eee}.response-field-text input.rf-size-small{width:130px}.response-field-text input.rf-size-medium{width:300px}.response-field-text input.rf-size-large{width:100%}.response-field-paragraph textarea.rf-size-small{width:200px;min-height:60px}.response-field-paragraph textarea.rf-size-medium{width:400px;min-height:100px}.response-field-paragraph textarea.rf-size-large{width:100%;min-height:200px}.response-field-address .street{width:400px}.response-field-address .city,.response-field-address .state,.response-field-address .zip,.response-field-address .country{width:198px}.response-field-date .month,.response-field-date .day,.response-field-date .year{width:50px}.response-field-time .hours,.response-field-time .minutes,.response-field-time .seconds{width:50px}.response-field-checkboxes .fb-option,.response-field-radio .fb-option{margin-bottom:5px;display:inline-block}
\ No newline at end of file
+.fb-button{display:inline-block;margin:0;padding:.563rem .844rem;border:0 none;background:#16a085;color:#fff;text-align:center;text-decoration:none;font-size:12px;line-height:1.5;cursor:pointer;border-radius:.125rem;border:thin solid #19b394;border-bottom:2px solid #16a085}.fb-button[disabled]{background:#ddd!important;border:thin solid #ccc;color:#777!important;text-shadow:none!important;-ms-filter:"alpha(Opacity=65)";opacity:.65;cursor:default}.fb-clear{clear:both}.fb-main{max-width:1000px;margin:0 auto;padding:0 20px 0 0;position:relative;font-family:'Source Sans Pro','Open Sans',Tahoma}.fb-save-wrapper{position:absolute;right:20px;top:10px}.fb-left{width:320px;float:left;padding-top:30px}.fb-right{padding-top:70px;margin-left:320px;border-left:1px solid #ddd;padding-left:20px;min-height:100%;overflow:hidden}.fb-no-response-fields{color:#999}.fb-tabs{list-style:none;margin:0 0 20px;padding:0 0 0 20px;border-bottom:1px solid #ccc}.fb-tabs li{display:inline-block}.fb-tabs li a{display:block;padding:10px;border-radius:5px 5px 0 0;font-size:13px;cursor:pointer;border-left:1px solid transparent;border-right:1px solid transparent}.fb-tabs li.active a{border:1px solid #ccc;margin-bottom:-1px;border-bottom-color:#fff}.fb-tab-content .fb-tab-pane{padding:0 20px;display:none}.fb-tab-content .fb-tab-pane.active{display:block}.fb-add-field-types .section{padding-bottom:5px;margin-bottom:20px}.fb-add-field-types{font-size:0}.fb-add-field-types a{font-size:13px;display:inline-block;width:48.5%;background-color:#1abc9c;margin-bottom:9px;box-sizing:border-box}.fb-add-field-types a:nth-child(odd){margin-right:3%}.fb-add-field-types a .symbol{opacity:.6;margin:0 .25em 0 -1em}.fb-response-fields{padding-bottom:150px}.fb-response-fields a.sortable-placeholder{display:block;border:1px dashed #ddd;min-height:80px;height:80px;width:100%}.fb-field-wrapper{cursor:pointer;position:relative;margin-bottom:20px}.fb-field-wrapper input{border-radius:3px;border:thin solid #ddd}.fb-field-wrapper:hover .actions-wrapper,.fb-field-wrapper.editing .actions-wrapper{display:block}.fb-field-wrapper:hover .subtemplate-wrapper{border-color:#ddd;border-radius:3px}.fb-field-wrapper.editing{background-color:#ecf0f1;border-radius:3px}.fb-field-wrapper.editing .subtemplate-wrapper{border-color:#d9e1e3;border-style:solid;margin:0;border-radius:3px}.fb-field-wrapper .actions-wrapper{display:none;position:absolute;bottom:-7px;right:5px;z-index:3}.fb-field-wrapper .actions-wrapper a{display:inline-block;background-color:#ccc;padding:2px 8px}.edit-response-field input,.edit-response-field textarea,.edit-response-field select{border:thin solid #ddd;border-radius:.25em;padding:.5em;display:inline-block;height:auto;vertical-align:middle}.edit-response-field input:focus,.edit-response-field textarea:focus,.edit-response-field select:focus{outline:0;border:thin solid #1abc9c}.edit-response-field select{font-size:14px}.fb-field-wrapper .actions-wrapper a.js-duplicate,.fb-edit-field-wrapper .js-add-option{background-color:#2ecc71;border:0}.fb-field-wrapper .actions-wrapper a.js-clear,.fb-edit-field-wrapper .js-remove-option{background-color:#e74c3c;border:0}.fb-field-wrapper .subtemplate-wrapper{border:1px dashed transparent;margin-bottom:10px;padding:10px;position:relative}.fb-field-wrapper .subtemplate-wrapper .cover{position:absolute;top:0;left:0;height:100%;width:100%;z-index:2}.fb-field-wrapper .subtemplate-wrapper>label{display:block;border-bottom:thin solid #eee;padding-bottom:3px;margin-bottom:7px}.fb-field-wrapper .subtemplate-wrapper abbr{color:red}.fb-field-wrapper .input-line{clear:both;margin-bottom:10px}.fb-field-wrapper .input-line .above-line{margin-top:7px}.fb-field-wrapper .input-line>span{display:inline-block;vertical-align:top}.fb-field-wrapper .input-line>span input{width:100%}.fb-field-wrapper .input-line>span>label{display:block;font-size:13px;margin-left:3px}.fb-field-wrapper .help-block{display:block;font-size:12px;margin-top:5px}.fb-edit-field-wrapper{font-size:13px}.fb-edit-field-wrapper .fb-field-label{font-weight:400;background:#eee;padding:.75em;color:#666;font-size:1.25em}.fb-edit-field-wrapper .fb-field-label .field-type{margin-top:.5em;display:block;font-family:'Source Sans Pro',sans-serif;font-size:1em}.fb-edit-field-wrapper .fb-field-label .field-type:before{content:'Type: ';color:#999}.fb-edit-field-wrapper .fb-field-label .fa.fa-arrow-right{display:none}.fb-edit-field-wrapper .fb-edit-section-header{border-bottom:1px solid #ddd;margin-top:25px;margin-bottom:10px;padding-bottom:5px;clear:both;font-weight:700}.fb-edit-field-wrapper .js-add-option,.fb-edit-field-wrapper .js-remove-option{padding:3px 6px}.fb-edit-field-wrapper .fb-bottom-add{margin-top:8px}.fb-common-wrapper .fb-label-description{margin-bottom:10px}.fb-common-wrapper .fb-label-description input,.fb-common-wrapper .fb-label-description textarea{width:100%}.fb-common-wrapper .fb-label-description textarea{min-height:5em}.response-field-draggable-helper{border:1px dashed #ddd;background:#eee}.response-field-text input.rf-size-small{width:130px}.response-field-text input.rf-size-medium{width:300px}.response-field-text input.rf-size-large{width:100%}.response-field-paragraph textarea.rf-size-small{width:200px;min-height:60px}.response-field-paragraph textarea.rf-size-medium{width:400px;min-height:100px}.response-field-paragraph textarea.rf-size-large{width:100%;min-height:200px}.response-field-address .street{width:400px}.response-field-address .city,.response-field-address .state,.response-field-address .zip,.response-field-address .country{width:198px}.response-field-date .month,.response-field-date .day,.response-field-date .year{width:50px}.response-field-time .hours,.response-field-time .minutes,.response-field-time .seconds{width:50px}.response-field-checkboxes .fb-option,.response-field-radio .fb-option{margin-bottom:5px;display:inline-block}
\ No newline at end of file
diff --git a/dist/formbuilder-min.js b/dist/formbuilder-min.js
index 3ecd18d3..f81dae40 100644
--- a/dist/formbuilder-min.js
+++ b/dist/formbuilder-min.js
@@ -1 +1 @@
-(function(){rivets.binders.input={publishes:!0,routine:rivets.binders.value.routine,bind:function(a){return a.addEventListener("input",this.publish)},unbind:function(a){return a.removeEventListener("input",this.publish)}},rivets.configure({prefix:"rv",adapter:{subscribe:function(a,b,c){return c.wrapped=function(a,b){return c(b)},a.on("change:"+b,c.wrapped)},unsubscribe:function(a,b,c){return a.off("change:"+b,c.wrapped)},read:function(a,b){return"cid"===b?a.cid:a.get(b)},publish:function(a,b,c){return a.cid?a.set(b,c):a[b]=c}}})}).call(this),function(){var a;a=function(){function a(b,c){null==c&&(c={}),_.extend(this,Backbone.Events),this.mainView=new a.views.main(_.extend({selector:b},c,{formBuilder:this}))}return a.helpers={defaultFieldAttrs:function(b){var c,d;return c={label:"Untitled",field_type:b,required:!0,field_options:{}},("function"==typeof(d=a.fields[b]).defaultAttributes?d.defaultAttributes(c):void 0)||c},simple_format:function(a){return null!=a?a.replace(/\n/g,"<br />"):void 0}},a.options={BUTTON_CLASS:"fb-button",HTTP_ENDPOINT:"",HTTP_METHOD:"POST",mappings:{SIZE:"field_options.size",UNITS:"field_options.units",LABEL:"label",FIELD_TYPE:"field_type",REQUIRED:"required",ADMIN_ONLY:"admin_only",OPTIONS:"field_options.options",DESCRIPTION:"field_options.description",INCLUDE_OTHER:"field_options.include_other_option",INCLUDE_BLANK:"field_options.include_blank_option",INTEGER_ONLY:"field_options.integer_only",MIN:"field_options.min",MAX:"field_options.max",MINLENGTH:"field_options.minlength",MAXLENGTH:"field_options.maxlength",LENGTH_UNITS:"field_options.min_max_length_units"},dict:{ALL_CHANGES_SAVED:"All changes saved",SAVE_FORM:"Save form",UNSAVED_CHANGES:"You have unsaved changes. If you leave this page, you will lose those changes!"}},a.fields={},a.inputFields={},a.nonInputFields={},a.model=Backbone.DeepModel.extend({sync:function(){},indexInDOM:function(){var a,b=this;return a=$(".fb-field-wrapper").filter(function(a,c){return $(c).data("cid")===b.cid}),$(".fb-field-wrapper").index(a)},is_input:function(){return null!=a.inputFields[this.get(a.options.mappings.FIELD_TYPE)]}}),a.collection=Backbone.Collection.extend({initialize:function(){return this.on("add",this.copyCidToModel)},model:a.model,comparator:function(a){return a.indexInDOM()},copyCidToModel:function(a){return a.attributes.cid=a.cid}}),a.registerField=function(b,c){var d,e,f,g;for(g=["view","edit"],e=0,f=g.length;f>e;e++)d=g[e],c[d]=_.template(c[d]);return c.field_type=b,a.fields[b]=c,"non_input"===c.type?a.nonInputFields[b]=c:a.inputFields[b]=c},a.views={view_field:Backbone.View.extend({className:"fb-field-wrapper",events:{"click .subtemplate-wrapper":"focusEditView","click .js-duplicate":"duplicate","click .js-clear":"clear"},initialize:function(){return this.parentView=this.options.parentView,this.listenTo(this.model,"change",this.render),this.listenTo(this.model,"destroy",this.remove)},render:function(){return this.$el.addClass("response-field-"+this.model.get(a.options.mappings.FIELD_TYPE)).data("cid",this.model.cid).html(a.templates["view/base"+(this.model.is_input()?"":"_non_input")]({rf:this.model})),this},focusEditView:function(){return this.parentView.createAndShowEditView(this.model)},clear:function(){return this.parentView.handleFormUpdate(),this.model.destroy()},duplicate:function(){var a;return a=_.clone(this.model.attributes),delete a.id,a.label+=" Copy",this.parentView.createField(a,{position:this.model.indexInDOM()+1})}}),edit_field:Backbone.View.extend({className:"edit-response-field",events:{"click .js-add-option":"addOption","click .js-remove-option":"removeOption","click .js-default-updated":"defaultUpdated","input .option-label-input":"forceRender"},initialize:function(){return this.listenTo(this.model,"destroy",this.remove)},render:function(){return this.$el.html(a.templates["edit/base"+(this.model.is_input()?"":"_non_input")]({rf:this.model})),rivets.bind(this.$el,{model:this.model}),this},remove:function(){return this.options.parentView.editView=void 0,this.options.parentView.$el.find('[data-target="#addField"]').click(),Backbone.View.prototype.remove.call(this)},addOption:function(b){var c,d,e,f;return c=$(b.currentTarget),d=this.$el.find(".option").index(c.closest(".option")),f=this.model.get(a.options.mappings.OPTIONS)||[],e={label:"",checked:!1},d>-1?f.splice(d+1,0,e):f.push(e),this.model.set(a.options.mappings.OPTIONS,f),this.model.trigger("change:"+a.options.mappings.OPTIONS),this.forceRender()},removeOption:function(b){var c,d,e;return c=$(b.currentTarget),d=this.$el.find(".js-remove-option").index(c),e=this.model.get(a.options.mappings.OPTIONS),e.splice(d,1),this.model.set(a.options.mappings.OPTIONS,e),this.model.trigger("change:"+a.options.mappings.OPTIONS),this.forceRender()},defaultUpdated:function(b){var c;return c=$(b.currentTarget),"checkboxes"!==this.model.get(a.options.mappings.FIELD_TYPE)&&this.$el.find(".js-default-updated").not(c).attr("checked",!1).trigger("change"),this.forceRender()},forceRender:function(){return this.model.trigger("change")}}),main:Backbone.View.extend({SUBVIEWS:[],events:{"click .js-save-form":"saveForm","click .fb-tabs a":"showTab","click .fb-add-field-types a":"addField"},initialize:function(){return this.$el=$(this.options.selector),this.formBuilder=this.options.formBuilder,this.collection=new a.collection,this.collection.bind("add",this.addOne,this),this.collection.bind("reset",this.reset,this),this.collection.bind("change",this.handleFormUpdate,this),this.collection.bind("destroy add reset",this.hideShowNoResponseFields,this),this.collection.bind("destroy",this.ensureEditViewScrolled,this),this.render(),this.collection.reset(this.options.bootstrapData),this.initAutosave()},initAutosave:function(){var b=this;return this.formSaved=!0,this.saveFormButton=this.$el.find(".js-save-form"),this.saveFormButton.attr("disabled",!0).text(a.options.dict.ALL_CHANGES_SAVED),setInterval(function(){return b.saveForm.call(b)},5e3),$(window).bind("beforeunload",function(){return b.formSaved?void 0:a.options.dict.UNSAVED_CHANGES})},reset:function(){return this.$responseFields.html(""),this.addAll()},render:function(){var b,c,d,e;for(this.$el.html(a.templates.page()),this.$fbLeft=this.$el.find(".fb-left"),this.$responseFields=this.$el.find(".fb-response-fields"),this.bindWindowScrollEvent(),this.hideShowNoResponseFields(),e=this.SUBVIEWS,c=0,d=e.length;d>c;c++)b=e[c],new b({parentView:this}).render();return this},bindWindowScrollEvent:function(){var a=this;return $(window).on("scroll",function(){var b,c;if(a.$fbLeft.data("locked")!==!0)return c=Math.max(0,$(window).scrollTop()),b=a.$responseFields.height(),a.$fbLeft.css({"margin-top":Math.min(b,c)})})},showTab:function(a){var b,c,d;return b=$(a.currentTarget),d=b.data("target"),b.closest("li").addClass("active").siblings("li").removeClass("active"),$(d).addClass("active").siblings(".fb-tab-pane").removeClass("active"),"#editField"!==d&&this.unlockLeftWrapper(),"#editField"===d&&!this.editView&&(c=this.collection.models[0])?this.createAndShowEditView(c):void 0},addOne:function(b,c,d){var e,f;return f=new a.views.view_field({model:b,parentView:this}),null!=d.$replaceEl?d.$replaceEl.replaceWith(f.render().el):null==d.position||-1===d.position?this.$responseFields.append(f.render().el):0===d.position?this.$responseFields.prepend(f.render().el):(e=this.$responseFields.find(".fb-field-wrapper").eq(d.position))[0]?e.before(f.render().el):this.$responseFields.append(f.render().el)},setSortable:function(){var b=this;return this.$responseFields.hasClass("ui-sortable")&&this.$responseFields.sortable("destroy"),this.$responseFields.sortable({forcePlaceholderSize:!0,placeholder:"sortable-placeholder",stop:function(c,d){var e;return d.item.data("field-type")&&(e=b.collection.create(a.helpers.defaultFieldAttrs(d.item.data("field-type")),{$replaceEl:d.item}),b.createAndShowEditView(e)),b.handleFormUpdate(),!0},update:function(a,c){return c.item.data("field-type")?void 0:b.ensureEditViewScrolled()}}),this.setDraggable()},setDraggable:function(){var a,b=this;return a=this.$el.find("[data-field-type]"),a.draggable({connectToSortable:this.$responseFields,helper:function(){var a;return a=$("<div class='response-field-draggable-helper' />"),a.css({width:b.$responseFields.width(),height:"80px"}),a}})},addAll:function(){return this.collection.each(this.addOne,this),this.setSortable()},hideShowNoResponseFields:function(){return this.$el.find(".fb-no-response-fields")[this.collection.length>0?"hide":"show"]()},addField:function(b){var c;return c=$(b.currentTarget).data("field-type"),this.createField(a.helpers.defaultFieldAttrs(c))},createField:function(a,b){var c;return c=this.collection.create(a,b),this.createAndShowEditView(c),this.handleFormUpdate()},createAndShowEditView:function(b){var c,d,e;if(d=this.$el.find(".fb-field-wrapper").filter(function(){return $(this).data("cid")===b.cid}),d.addClass("editing").siblings(".fb-field-wrapper").removeClass("editing"),this.editView){if(this.editView.model.cid===b.cid)return this.$el.find('.fb-tabs a[data-target="#editField"]').click(),this.scrollLeftWrapper(d,"undefined"!=typeof e&&null!==e&&e),void 0;e=this.$fbLeft.css("padding-top"),this.editView.remove()}return this.editView=new a.views.edit_field({model:b,parentView:this}),c=this.editView.render().$el,this.$el.find(".fb-edit-field-wrapper").html(c),this.$el.find('.fb-tabs a[data-target="#editField"]').click(),this.scrollLeftWrapper(d),this},ensureEditViewScrolled:function(){return this.editView?this.scrollLeftWrapper($(".fb-field-wrapper.editing")):void 0},scrollLeftWrapper:function(a){var b=this;return this.unlockLeftWrapper(),a[0]?$.scrollWindowTo(a.offset().top-this.$responseFields.offset().top,200,function(){return b.lockLeftWrapper()}):void 0},lockLeftWrapper:function(){return this.$fbLeft.data("locked",!0)},unlockLeftWrapper:function(){return this.$fbLeft.data("locked",!1)},handleFormUpdate:function(){return this.updatingBatch?void 0:(this.formSaved=!1,this.saveFormButton.removeAttr("disabled").text(a.options.dict.SAVE_FORM))},saveForm:function(){var b;if(!this.formSaved)return this.formSaved=!0,this.saveFormButton.attr("disabled",!0).text(a.options.dict.ALL_CHANGES_SAVED),this.collection.sort(),b=JSON.stringify({fields:this.collection.toJSON()}),a.options.HTTP_ENDPOINT&&this.doAjaxSave(b),this.formBuilder.trigger("save",b)},doAjaxSave:function(b){var c=this;return $.ajax({url:a.options.HTTP_ENDPOINT,type:a.options.HTTP_METHOD,data:b,contentType:"application/json",success:function(a){var b,d,e,f;for(c.updatingBatch=!0,d=0,e=a.length;e>d;d++)b=a[d],null!=(f=c.collection.get(b.cid))&&f.set({id:b.id}),c.collection.trigger("sync");return c.updatingBatch=void 0}})}})},a}(),window.Formbuilder=a,"undefined"!=typeof module&&null!==module?module.exports=a:window.Formbuilder=a}.call(this),function(){Formbuilder.registerField("address",{order:50,view:"<div class='input-line'>\n  <span class='street'>\n    <input type='text' />\n    <label>Address</label>\n  </span>\n</div>\n\n<div class='input-line'>\n  <span class='city'>\n    <input type='text' />\n    <label>City</label>\n  </span>\n\n  <span class='state'>\n    <input type='text' />\n    <label>State / Province / Region</label>\n  </span>\n</div>\n\n<div class='input-line'>\n  <span class='zip'>\n    <input type='text' />\n    <label>Zipcode</label>\n  </span>\n\n  <span class='country'>\n    <select><option>United States</option></select>\n    <label>Country</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="icon-home"></span></span> Address'})}.call(this),function(){Formbuilder.registerField("checkboxes",{order:10,view:"<% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n  <div>\n    <label class='fb-option'>\n      <input type='checkbox' <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'checked' %> onclick=\"javascript: return false;\" />\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </label>\n  </div>\n<% } %>\n\n<% if (rf.get(Formbuilder.options.mappings.INCLUDE_OTHER)) { %>\n  <div class='other-option'>\n    <label class='fb-option'>\n      <input type='checkbox' />\n      Other\n    </label>\n\n    <input type='text' />\n  </div>\n<% } %>",edit:"<%= Formbuilder.templates['edit/options']({ includeOther: true }) %>",addButton:'<span class="symbol"><span class="icon-check-empty"></span></span> Checkboxes',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a}})}.call(this),function(){Formbuilder.registerField("date",{order:20,view:"<div class='input-line'>\n  <span class='month'>\n    <input type=\"text\" />\n    <label>MM</label>\n  </span>\n\n  <span class='above-line'>/</span>\n\n  <span class='day'>\n    <input type=\"text\" />\n    <label>DD</label>\n  </span>\n\n  <span class='above-line'>/</span>\n\n  <span class='year'>\n    <input type=\"text\" />\n    <label>YYYY</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="icon-calendar"></span></span> Date'})}.call(this),function(){Formbuilder.registerField("dropdown",{order:24,view:"<select>\n  <% if (rf.get(Formbuilder.options.mappings.INCLUDE_BLANK)) { %>\n    <option value=''></option>\n  <% } %>\n\n  <% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n    <option <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'selected' %>>\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </option>\n  <% } %>\n</select>",edit:"<%= Formbuilder.templates['edit/options']({ includeBlank: true }) %>",addButton:'<span class="symbol"><span class="icon-caret-down"></span></span> Dropdown',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a.field_options.include_blank_option=!1,a}})}.call(this),function(){Formbuilder.registerField("email",{order:40,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' />",edit:"",addButton:'<span class="symbol"><span class="icon-envelope-alt"></span></span> Email'})}.call(this),function(){Formbuilder.registerField("file",{order:55,view:"<input type='file' />",edit:"",addButton:'<span class="symbol"><span class="icon-cloud-upload"></span></span> File'})}.call(this),function(){Formbuilder.registerField("number",{order:30,view:"<input type='text' />\n<% if (units = rf.get(Formbuilder.options.mappings.UNITS)) { %>\n  <%= units %>\n<% } %>",edit:"<%= Formbuilder.templates['edit/min_max']() %>\n<%= Formbuilder.templates['edit/units']() %>\n<%= Formbuilder.templates['edit/integer_only']() %>",addButton:'<span class="symbol"><span class="icon-number">123</span></span> Number'})}.call(this),function(){Formbuilder.registerField("paragraph",{order:5,view:"<textarea class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>'></textarea>",edit:"<%= Formbuilder.templates['edit/size']() %>\n<%= Formbuilder.templates['edit/min_max_length']() %>",addButton:'<span class="symbol">&#182;</span> Paragraph',defaultAttributes:function(a){return a.field_options.size="small",a}})}.call(this),function(){Formbuilder.registerField("price",{order:45,view:"<div class='input-line'>\n  <span class='above-line'>$</span>\n  <span class='dolars'>\n    <input type='text' />\n    <label>Dollars</label>\n  </span>\n  <span class='above-line'>.</span>\n  <span class='cents'>\n    <input type='text' />\n    <label>Cents</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="icon-dollar"></span></span> Price'})}.call(this),function(){Formbuilder.registerField("radio",{order:15,view:"<% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n  <div>\n    <label class='fb-option'>\n      <input type='radio' <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'checked' %> onclick=\"javascript: return false;\" />\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </label>\n  </div>\n<% } %>\n\n<% if (rf.get(Formbuilder.options.mappings.INCLUDE_OTHER)) { %>\n  <div class='other-option'>\n    <label class='fb-option'>\n      <input type='radio' />\n      Other\n    </label>\n\n    <input type='text' />\n  </div>\n<% } %>",edit:"<%= Formbuilder.templates['edit/options']({ includeOther: true }) %>",addButton:'<span class="symbol"><span class="icon-circle-blank"></span></span> Multiple Choice',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a}})}.call(this),function(){Formbuilder.registerField("section_break",{order:0,type:"non_input",view:"<label class='section-name'><%= rf.get(Formbuilder.options.mappings.LABEL) %></label>\n<p><%= rf.get(Formbuilder.options.mappings.DESCRIPTION) %></p>",edit:"<div class='fb-edit-section-header'>Label</div>\n<input type='text' data-rv-input='model.<%= Formbuilder.options.mappings.LABEL %>' />\n<textarea data-rv-input='model.<%= Formbuilder.options.mappings.DESCRIPTION %>'\n  placeholder='Add a longer description to this field'></textarea>",addButton:"<span class='symbol'><span class='icon-minus'></span></span> Section Break"})}.call(this),function(){Formbuilder.registerField("text",{order:0,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' />",edit:"<%= Formbuilder.templates['edit/size']() %>\n<%= Formbuilder.templates['edit/min_max_length']() %>",addButton:"<span class='symbol'><span class='icon-font'></span></span> Text",defaultAttributes:function(a){return a.field_options.size="small",a}})}.call(this),function(){Formbuilder.registerField("time",{order:25,view:"<div class='input-line'>\n  <span class='hours'>\n    <input type=\"text\" />\n    <label>HH</label>\n  </span>\n\n  <span class='above-line'>:</span>\n\n  <span class='minutes'>\n    <input type=\"text\" />\n    <label>MM</label>\n  </span>\n\n  <span class='above-line'>:</span>\n\n  <span class='seconds'>\n    <input type=\"text\" />\n    <label>SS</label>\n  </span>\n\n  <span class='am_pm'>\n    <select>\n      <option>AM</option>\n      <option>PM</option>\n    </select>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="icon-time"></span></span> Time'})}.call(this),function(){Formbuilder.registerField("website",{order:35,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' placeholder='http://' />",edit:"<%= Formbuilder.templates['edit/size']() %>",addButton:'<span class="symbol"><span class="icon-link"></span></span> Website'})}.call(this),this.Formbuilder=this.Formbuilder||{},this.Formbuilder.templates=this.Formbuilder.templates||{},this.Formbuilder.templates["edit/base"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["edit/base_header"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["edit/common"]())?"":__t)+"\n"+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].edit({rf:rf}))?"":__t)+"\n";return __p},this.Formbuilder.templates["edit/base_header"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-field-label'>\n  <span data-rv-text=\"model."+(null==(__t=Formbuilder.options.mappings.LABEL)?"":__t)+"\"></span>\n  <code class='field-type' data-rv-text='model."+(null==(__t=Formbuilder.options.mappings.FIELD_TYPE)?"":__t)+"'></code>\n  <span class='icon-arrow-right pull-right'></span>\n</div>";return __p},this.Formbuilder.templates["edit/base_non_input"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["edit/base_header"]())?"":__t)+"\n"+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].edit({rf:rf}))?"":__t)+"\n";return __p},this.Formbuilder.templates["edit/checkboxes"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.REQUIRED)?"":__t)+"' />\n  Required\n</label>\n<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.ADMIN_ONLY)?"":__t)+"' />\n  Admin only\n</label>";return __p},this.Formbuilder.templates["edit/common"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Label</div>\n\n<div class='fb-common-wrapper'>\n  <div class='fb-label-description'>\n    "+(null==(__t=Formbuilder.templates["edit/label_description"]())?"":__t)+"\n  </div>\n  <div class='fb-common-checkboxes'>\n    "+(null==(__t=Formbuilder.templates["edit/checkboxes"]())?"":__t)+"\n  </div>\n  <div class='fb-clear'></div>\n</div>\n";return __p},this.Formbuilder.templates["edit/integer_only"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Integer only</div>\n<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INTEGER_ONLY)?"":__t)+"' />\n  Only accept integers\n</label>\n";return __p},this.Formbuilder.templates["edit/label_description"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<input type='text' data-rv-input='model."+(null==(__t=Formbuilder.options.mappings.LABEL)?"":__t)+"' />\n<textarea data-rv-input='model."+(null==(__t=Formbuilder.options.mappings.DESCRIPTION)?"":__t)+"'\n  placeholder='Add a longer description to this field'></textarea>";return __p},this.Formbuilder.templates["edit/min_max"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Minimum / Maximum</div>\n\nAbove\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MIN)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\nBelow\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MAX)?"":__t)+'" style="width: 30px" />\n';return __p},this.Formbuilder.templates["edit/min_max_length"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Length Limit</div>\n\nMin\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MINLENGTH)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\nMax\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MAXLENGTH)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\n<select data-rv-value="model.'+(null==(__t=Formbuilder.options.mappings.LENGTH_UNITS)?"":__t)+'" style="width: auto;">\n  <option value="characters">characters</option>\n  <option value="words">words</option>\n</select>\n';return __p},this.Formbuilder.templates["edit/options"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<div class='fb-edit-section-header'>Options</div>\n\n","undefined"!=typeof includeBlank&&(__p+="\n  <label>\n    <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INCLUDE_BLANK)?"":__t)+"' />\n    Include blank\n  </label>\n"),__p+="\n\n<div class='option' data-rv-each-option='model."+(null==(__t=Formbuilder.options.mappings.OPTIONS)?"":__t)+'\'>\n  <input type="checkbox" class=\'js-default-updated\' data-rv-checked="option:checked" />\n  <input type="text" data-rv-input="option:label" class=\'option-label-input\' />\n  <a class="js-add-option '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Add Option"><i class=\'icon-plus-sign\'></i></a>\n  <a class="js-remove-option '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Remove Option"><i class=\'icon-minus-sign\'></i></a>\n</div>\n\n',"undefined"!=typeof includeOther&&(__p+="\n  <label>\n    <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INCLUDE_OTHER)?"":__t)+'\' />\n    Include "other"\n  </label>\n'),__p+="\n\n<div class='fb-bottom-add'>\n  <a class=\"js-add-option "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">Add option</a>\n</div>\n';return __p},this.Formbuilder.templates["edit/size"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Size</div>\n<select data-rv-value=\"model."+(null==(__t=Formbuilder.options.mappings.SIZE)?"":__t)+'">\n  <option value="small">Small</option>\n  <option value="medium">Medium</option>\n  <option value="large">Large</option>\n</select>\n';return __p},this.Formbuilder.templates["edit/units"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Units</div>\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.UNITS)?"":__t)+'" />\n';return __p},this.Formbuilder.templates.page=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["partials/save_button"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["partials/left_side"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["partials/right_side"]())?"":__t)+"\n<div class='fb-clear'></div>";return __p},this.Formbuilder.templates["partials/add_field"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<div class='fb-tab-pane active' id='addField'>\n  <div class='fb-add-field-types'>\n    <div class='section'>\n      ",_.each(_.sortBy(Formbuilder.inputFields,"order"),function(a){__p+='\n        <a data-field-type="'+(null==(__t=a.field_type)?"":__t)+'" class="'+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">\n          '+(null==(__t=a.addButton)?"":__t)+"\n        </a>\n      "}),__p+="\n    </div>\n\n    <div class='section'>\n      ",_.each(_.sortBy(Formbuilder.nonInputFields,"order"),function(a){__p+='\n        <a data-field-type="'+(null==(__t=a.field_type)?"":__t)+'" class="'+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">\n          '+(null==(__t=a.addButton)?"":__t)+"\n        </a>\n      "}),__p+="\n    </div>\n  </div>\n</div>";return __p},this.Formbuilder.templates["partials/edit_field"]=function(obj){obj||(obj={});var __p="";with(_.escape,obj)__p+="<div class='fb-tab-pane' id='editField'>\n  <div class='fb-edit-field-wrapper'></div>\n</div>\n";return __p},this.Formbuilder.templates["partials/left_side"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-left'>\n  <ul class='fb-tabs'>\n    <li class='active'><a data-target='#addField'>Add new field</a></li>\n    <li><a data-target='#editField'>Edit field</a></li>\n  </ul>\n\n  <div class='fb-tab-content'>\n    "+(null==(__t=Formbuilder.templates["partials/add_field"]())?"":__t)+"\n    "+(null==(__t=Formbuilder.templates["partials/edit_field"]())?"":__t)+"\n  </div>\n</div>";return __p},this.Formbuilder.templates["partials/right_side"]=function(obj){obj||(obj={});var __p="";with(_.escape,obj)__p+="<div class='fb-right'>\n  <div class='fb-no-response-fields'>No response fields</div>\n  <div class='fb-response-fields'></div>\n</div>\n";return __p},this.Formbuilder.templates["partials/save_button"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-save-wrapper'>\n  <button class='js-save-form "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+"'></button>\n</div>";return __p},this.Formbuilder.templates["view/base"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='subtemplate-wrapper'>\n  <div class='cover'></div>\n  "+(null==(__t=Formbuilder.templates["view/label"]({rf:rf}))?"":__t)+"\n\n  "+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].view({rf:rf}))?"":__t)+"\n\n  "+(null==(__t=Formbuilder.templates["view/description"]({rf:rf}))?"":__t)+"\n  "+(null==(__t=Formbuilder.templates["view/duplicate_remove"]({rf:rf}))?"":__t)+"\n</div>\n";return __p},this.Formbuilder.templates["view/base_non_input"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='subtemplate-wrapper'>\n  <div class='cover'></div>\n  "+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].view({rf:rf}))?"":__t)+"\n  "+(null==(__t=Formbuilder.templates["view/duplicate_remove"]({rf:rf}))?"":__t)+"\n</div>\n";return __p},this.Formbuilder.templates["view/description"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<span class='help-block'>\n  "+(null==(__t=Formbuilder.helpers.simple_format(rf.get(Formbuilder.options.mappings.DESCRIPTION)))?"":__t)+"\n</span>\n";return __p},this.Formbuilder.templates["view/duplicate_remove"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='actions-wrapper'>\n  <a class=\"js-duplicate "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Duplicate Field"><i class=\'icon-plus-sign\'></i></a>\n  <a class="js-clear '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Remove Field"><i class=\'icon-minus-sign\'></i></a>\n</div>';return __p},this.Formbuilder.templates["view/label"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<label>\n  <span>"+(null==(__t=Formbuilder.helpers.simple_format(rf.get(Formbuilder.options.mappings.LABEL)))?"":__t)+"\n  ",rf.get(Formbuilder.options.mappings.REQUIRED)&&(__p+="\n    <abbr title='required'>*</abbr>\n  "),__p+="\n</label>\n";return __p};
\ No newline at end of file
+(function(){rivets.binders.input={publishes:!0,routine:rivets.binders.value.routine,bind:function(a){return a.addEventListener("input",this.publish)},unbind:function(a){return a.removeEventListener("input",this.publish)}},rivets.configure({prefix:"rv",adapter:{subscribe:function(a,b,c){return c.wrapped=function(a,b){return c(b)},a.on("change:"+b,c.wrapped)},unsubscribe:function(a,b,c){return a.off("change:"+b,c.wrapped)},read:function(a,b){return"cid"===b?a.cid:a.get(b)},publish:function(a,b,c){return a.cid?a.set(b,c):a[b]=c}}})}).call(this),function(){var a;a=function(){function a(b){var c;null==b&&(b={}),_.extend(this,Backbone.Events),c=_.extend(b,{formBuilder:this}),this.mainView=new a.views.main(c)}return a.helpers={defaultFieldAttrs:function(b){var c,d;return c={label:"Untitled",field_type:b,required:!0,field_options:{}},("function"==typeof(d=a.fields[b]).defaultAttributes?d.defaultAttributes(c):void 0)||c},simple_format:function(a){return null!=a?a.replace(/\n/g,"<br />"):void 0}},a.options={BUTTON_CLASS:"fb-button",HTTP_ENDPOINT:"",HTTP_METHOD:"POST",mappings:{SIZE:"field_options.size",UNITS:"field_options.units",LABEL:"label",FIELD_TYPE:"field_type",REQUIRED:"required",ADMIN_ONLY:"admin_only",OPTIONS:"field_options.options",DESCRIPTION:"field_options.description",INCLUDE_OTHER:"field_options.include_other_option",INCLUDE_BLANK:"field_options.include_blank_option",INTEGER_ONLY:"field_options.integer_only",MIN:"field_options.min",MAX:"field_options.max",MINLENGTH:"field_options.minlength",MAXLENGTH:"field_options.maxlength",LENGTH_UNITS:"field_options.min_max_length_units"},dict:{ALL_CHANGES_SAVED:"All changes saved",SAVE_FORM:"Save form",UNSAVED_CHANGES:"You have unsaved changes. If you leave this page, you will lose those changes!"}},a.fields={},a.inputFields={},a.nonInputFields={},a.model=Backbone.DeepModel.extend({sync:function(){},indexInDOM:function(){var a,b=this;return a=$(".fb-field-wrapper").filter(function(a,c){return $(c).data("cid")===b.cid}),$(".fb-field-wrapper").index(a)},is_input:function(){return null!=a.inputFields[this.get(a.options.mappings.FIELD_TYPE)]}}),a.collection=Backbone.Collection.extend({initialize:function(){return this.on("add",this.copyCidToModel)},model:a.model,comparator:function(a){return a.indexInDOM()},copyCidToModel:function(a){return a.attributes.cid=a.cid}}),a.registerField=function(b,c){var d,e,f,g;for(g=["view","edit"],e=0,f=g.length;f>e;e++)d=g[e],c[d]=_.template(c[d]);return c.field_type=b,a.fields[b]=c,"non_input"===c.type?a.nonInputFields[b]=c:a.inputFields[b]=c},a.views={view_field:Backbone.View.extend({className:"fb-field-wrapper",events:{"click .subtemplate-wrapper":"focusEditView","click .js-duplicate":"duplicate","click .js-clear":"clear"},initialize:function(a){return this.parentView=a.parentView,this.listenTo(this.model,"change",this.render),this.listenTo(this.model,"destroy",this.remove)},render:function(){return this.$el.addClass("response-field-"+this.model.get(a.options.mappings.FIELD_TYPE)).data("cid",this.model.cid).html(a.templates["view/base"+(this.model.is_input()?"":"_non_input")]({rf:this.model})),this},focusEditView:function(){return this.parentView.createAndShowEditView(this.model)},clear:function(){return this.parentView.handleFormUpdate(),this.model.destroy()},duplicate:function(){var a;return a=_.clone(this.model.attributes),delete a.id,a.label+=" Copy",this.parentView.createField(a,{position:this.model.indexInDOM()+1})}}),edit_field:Backbone.View.extend({className:"edit-response-field",events:{"click .js-add-option":"addOption","click .js-remove-option":"removeOption","click .js-default-updated":"defaultUpdated","input .option-label-input":"forceRender"},initialize:function(a){return this.parentView=a.parentView,this.listenTo(this.model,"destroy",this.remove)},render:function(){return this.$el.html(a.templates["edit/base"+(this.model.is_input()?"":"_non_input")]({rf:this.model})),rivets.bind(this.$el,{model:this.model}),this},remove:function(){return this.parentView.editView=void 0,this.parentView.$el.find('[data-target="#addField"]').click(),Backbone.View.prototype.remove.call(this)},addOption:function(b){var c,d,e,f;return c=$(b.currentTarget),d=this.$el.find(".option").index(c.closest(".option")),f=this.model.get(a.options.mappings.OPTIONS)||[],e={label:"",checked:!1},d>-1?f.splice(d+1,0,e):f.push(e),this.model.set(a.options.mappings.OPTIONS,f),this.model.trigger("change:"+a.options.mappings.OPTIONS),this.forceRender()},removeOption:function(b){var c,d,e;return c=$(b.currentTarget),d=this.$el.find(".js-remove-option").index(c),e=this.model.get(a.options.mappings.OPTIONS),e.splice(d,1),this.model.set(a.options.mappings.OPTIONS,e),this.model.trigger("change:"+a.options.mappings.OPTIONS),this.forceRender()},defaultUpdated:function(b){var c;return c=$(b.currentTarget),"checkboxes"!==this.model.get(a.options.mappings.FIELD_TYPE)&&this.$el.find(".js-default-updated").not(c).attr("checked",!1).trigger("change"),this.forceRender()},forceRender:function(){return this.model.trigger("change")}}),main:Backbone.View.extend({SUBVIEWS:[],events:{"click .js-save-form":"saveForm","click .fb-tabs a":"showTab","click .fb-add-field-types a":"addField"},initialize:function(b){var c;return c=b.selector,this.formBuilder=b.formBuilder,this.bootstrapData=b.bootstrapData,null!=c&&this.setElement($(c)),this.collection=new a.collection,this.collection.bind("add",this.addOne,this),this.collection.bind("reset",this.reset,this),this.collection.bind("change",this.handleFormUpdate,this),this.collection.bind("destroy add reset",this.hideShowNoResponseFields,this),this.collection.bind("destroy",this.ensureEditViewScrolled,this),this.render(),this.collection.reset(this.bootstrapData),this.initAutosave()},initAutosave:function(){var b=this;return this.formSaved=!0,this.saveFormButton=this.$el.find(".js-save-form"),this.saveFormButton.attr("disabled",!0).text(a.options.dict.ALL_CHANGES_SAVED),setInterval(function(){return b.saveForm.call(b)},5e3),$(window).bind("beforeunload",function(){return b.formSaved?void 0:a.options.dict.UNSAVED_CHANGES})},reset:function(){return this.$responseFields.html(""),this.addAll()},render:function(){var b,c,d,e;for(this.$el.html(a.templates.page()),this.$fbLeft=this.$el.find(".fb-left"),this.$responseFields=this.$el.find(".fb-response-fields"),this.bindWindowScrollEvent(),this.hideShowNoResponseFields(),e=this.SUBVIEWS,c=0,d=e.length;d>c;c++)b=e[c],new b({parentView:this}).render();return this},bindWindowScrollEvent:function(){var a=this;return $(window).on("scroll",function(){var b,c;if(a.$fbLeft.data("locked")!==!0)return c=Math.max(0,$(window).scrollTop()),b=a.$responseFields.height(),a.$fbLeft.css({"margin-top":Math.min(b,c)})})},showTab:function(a){var b,c,d;return b=$(a.currentTarget),d=b.data("target"),b.closest("li").addClass("active").siblings("li").removeClass("active"),$(d).addClass("active").siblings(".fb-tab-pane").removeClass("active"),"#editField"!==d&&this.unlockLeftWrapper(),"#editField"===d&&!this.editView&&(c=this.collection.models[0])?this.createAndShowEditView(c):void 0},addOne:function(b,c,d){var e,f;return f=new a.views.view_field({model:b,parentView:this}),null!=d.$replaceEl?d.$replaceEl.replaceWith(f.render().el):null==d.position||-1===d.position?this.$responseFields.append(f.render().el):0===d.position?this.$responseFields.prepend(f.render().el):(e=this.$responseFields.find(".fb-field-wrapper").eq(d.position))[0]?e.before(f.render().el):this.$responseFields.append(f.render().el)},setSortable:function(){var b=this;return this.$responseFields.hasClass("ui-sortable")&&this.$responseFields.sortable("destroy"),this.$responseFields.sortable({forcePlaceholderSize:!0,placeholder:"sortable-placeholder",stop:function(c,d){var e;return d.item.data("field-type")&&(e=b.collection.create(a.helpers.defaultFieldAttrs(d.item.data("field-type")),{$replaceEl:d.item}),b.createAndShowEditView(e)),b.handleFormUpdate(),!0},update:function(a,c){return c.item.data("field-type")?void 0:b.ensureEditViewScrolled()}}),this.setDraggable()},setDraggable:function(){var a,b=this;return a=this.$el.find("[data-field-type]"),a.draggable({connectToSortable:this.$responseFields,helper:function(){var a;return a=$("<div class='response-field-draggable-helper' />"),a.css({width:b.$responseFields.width(),height:"80px"}),a}})},addAll:function(){return this.collection.each(this.addOne,this),this.setSortable()},hideShowNoResponseFields:function(){return this.$el.find(".fb-no-response-fields")[this.collection.length>0?"hide":"show"]()},addField:function(b){var c;return c=$(b.currentTarget).data("field-type"),this.createField(a.helpers.defaultFieldAttrs(c))},createField:function(a,b){var c;return c=this.collection.create(a,b),this.createAndShowEditView(c),this.handleFormUpdate()},createAndShowEditView:function(b){var c,d,e;if(d=this.$el.find(".fb-field-wrapper").filter(function(){return $(this).data("cid")===b.cid}),d.addClass("editing").siblings(".fb-field-wrapper").removeClass("editing"),this.editView){if(this.editView.model.cid===b.cid)return this.$el.find('.fb-tabs a[data-target="#editField"]').click(),this.scrollLeftWrapper(d,"undefined"!=typeof e&&null!==e&&e),void 0;e=this.$fbLeft.css("padding-top"),this.editView.remove()}return this.editView=new a.views.edit_field({model:b,parentView:this}),c=this.editView.render().$el,this.$el.find(".fb-edit-field-wrapper").html(c),this.$el.find('.fb-tabs a[data-target="#editField"]').click(),this.scrollLeftWrapper(d),this},ensureEditViewScrolled:function(){return this.editView?this.scrollLeftWrapper($(".fb-field-wrapper.editing")):void 0},scrollLeftWrapper:function(a){var b=this;return this.unlockLeftWrapper(),a[0]?$.scrollWindowTo(a.offset().top-this.$responseFields.offset().top,200,function(){return b.lockLeftWrapper()}):void 0},lockLeftWrapper:function(){return this.$fbLeft.data("locked",!0)},unlockLeftWrapper:function(){return this.$fbLeft.data("locked",!1)},handleFormUpdate:function(){return this.updatingBatch?void 0:(this.formSaved=!1,this.saveFormButton.removeAttr("disabled").text(a.options.dict.SAVE_FORM))},saveForm:function(){var b;if(!this.formSaved)return this.formSaved=!0,this.saveFormButton.attr("disabled",!0).text(a.options.dict.ALL_CHANGES_SAVED),this.collection.sort(),b=JSON.stringify({fields:this.collection.toJSON()}),a.options.HTTP_ENDPOINT&&this.doAjaxSave(b),this.formBuilder.trigger("save",b)},doAjaxSave:function(b){var c=this;return $.ajax({url:a.options.HTTP_ENDPOINT,type:a.options.HTTP_METHOD,data:b,contentType:"application/json",success:function(a){var b,d,e,f;for(c.updatingBatch=!0,d=0,e=a.length;e>d;d++)b=a[d],null!=(f=c.collection.get(b.cid))&&f.set({id:b.id}),c.collection.trigger("sync");return c.updatingBatch=void 0}})}})},a}(),window.Formbuilder=a,"undefined"!=typeof module&&null!==module?module.exports=a:window.Formbuilder=a}.call(this),function(){Formbuilder.registerField("address",{order:50,view:"<div class='input-line'>\n  <span class='street'>\n    <input type='text' />\n    <label>Address</label>\n  </span>\n</div>\n\n<div class='input-line'>\n  <span class='city'>\n    <input type='text' />\n    <label>City</label>\n  </span>\n\n  <span class='state'>\n    <input type='text' />\n    <label>State / Province / Region</label>\n  </span>\n</div>\n\n<div class='input-line'>\n  <span class='zip'>\n    <input type='text' />\n    <label>Zipcode</label>\n  </span>\n\n  <span class='country'>\n    <select><option>United States</option></select>\n    <label>Country</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="fa fa-home"></span></span> Address'})}.call(this),function(){Formbuilder.registerField("checkboxes",{order:10,view:"<% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n  <div>\n    <label class='fb-option'>\n      <input type='checkbox' <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'checked' %> onclick=\"javascript: return false;\" />\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </label>\n  </div>\n<% } %>\n\n<% if (rf.get(Formbuilder.options.mappings.INCLUDE_OTHER)) { %>\n  <div class='other-option'>\n    <label class='fb-option'>\n      <input type='checkbox' />\n      Other\n    </label>\n\n    <input type='text' />\n  </div>\n<% } %>",edit:"<%= Formbuilder.templates['edit/options']({ includeOther: true }) %>",addButton:'<span class="symbol"><span class="fa fa-square-o"></span></span> Checkboxes',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a}})}.call(this),function(){Formbuilder.registerField("date",{order:20,view:"<div class='input-line'>\n  <span class='month'>\n    <input type=\"text\" />\n    <label>MM</label>\n  </span>\n\n  <span class='above-line'>/</span>\n\n  <span class='day'>\n    <input type=\"text\" />\n    <label>DD</label>\n  </span>\n\n  <span class='above-line'>/</span>\n\n  <span class='year'>\n    <input type=\"text\" />\n    <label>YYYY</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="fa fa-calendar"></span></span> Date'})}.call(this),function(){Formbuilder.registerField("dropdown",{order:24,view:"<select>\n  <% if (rf.get(Formbuilder.options.mappings.INCLUDE_BLANK)) { %>\n    <option value=''></option>\n  <% } %>\n\n  <% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n    <option <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'selected' %>>\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </option>\n  <% } %>\n</select>",edit:"<%= Formbuilder.templates['edit/options']({ includeBlank: true }) %>",addButton:'<span class="symbol"><span class="fa fa-caret-down"></span></span> Dropdown',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a.field_options.include_blank_option=!1,a}})}.call(this),function(){Formbuilder.registerField("email",{order:40,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' />",edit:"",addButton:'<span class="symbol"><span class="fa fa-envelope-o"></span></span> Email'})}.call(this),function(){Formbuilder.registerField("file",{order:55,view:"<input type='file' />",edit:"",addButton:'<span class="symbol"><span class="fa fa-cloud-upload"></span></span> File'})}.call(this),function(){Formbuilder.registerField("number",{order:30,view:"<input type='text' />\n<% if (units = rf.get(Formbuilder.options.mappings.UNITS)) { %>\n  <%= units %>\n<% } %>",edit:"<%= Formbuilder.templates['edit/min_max']() %>\n<%= Formbuilder.templates['edit/units']() %>\n<%= Formbuilder.templates['edit/integer_only']() %>",addButton:'<span class="symbol"><span class="fa fa-number">123</span></span> Number'})}.call(this),function(){Formbuilder.registerField("paragraph",{order:5,view:"<textarea class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>'></textarea>",edit:"<%= Formbuilder.templates['edit/size']() %>\n<%= Formbuilder.templates['edit/min_max_length']() %>",addButton:'<span class="symbol">&#182;</span> Paragraph',defaultAttributes:function(a){return a.field_options.size="small",a}})}.call(this),function(){Formbuilder.registerField("price",{order:45,view:"<div class='input-line'>\n  <span class='above-line'>$</span>\n  <span class='dolars'>\n    <input type='text' />\n    <label>Dollars</label>\n  </span>\n  <span class='above-line'>.</span>\n  <span class='cents'>\n    <input type='text' />\n    <label>Cents</label>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="fa fa-usd"></span></span> Price'})}.call(this),function(){Formbuilder.registerField("radio",{order:15,view:"<% for (i in (rf.get(Formbuilder.options.mappings.OPTIONS) || [])) { %>\n  <div>\n    <label class='fb-option'>\n      <input type='radio' <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].checked && 'checked' %> onclick=\"javascript: return false;\" />\n      <%= rf.get(Formbuilder.options.mappings.OPTIONS)[i].label %>\n    </label>\n  </div>\n<% } %>\n\n<% if (rf.get(Formbuilder.options.mappings.INCLUDE_OTHER)) { %>\n  <div class='other-option'>\n    <label class='fb-option'>\n      <input type='radio' />\n      Other\n    </label>\n\n    <input type='text' />\n  </div>\n<% } %>",edit:"<%= Formbuilder.templates['edit/options']({ includeOther: true }) %>",addButton:'<span class="symbol"><span class="fa fa-circle-o"></span></span> Multiple Choice',defaultAttributes:function(a){return a.field_options.options=[{label:"",checked:!1},{label:"",checked:!1}],a}})}.call(this),function(){Formbuilder.registerField("section_break",{order:0,type:"non_input",view:"<label class='section-name'><%= rf.get(Formbuilder.options.mappings.LABEL) %></label>\n<p><%= rf.get(Formbuilder.options.mappings.DESCRIPTION) %></p>",edit:"<div class='fb-edit-section-header'>Label</div>\n<input type='text' data-rv-input='model.<%= Formbuilder.options.mappings.LABEL %>' />\n<textarea data-rv-input='model.<%= Formbuilder.options.mappings.DESCRIPTION %>'\n  placeholder='Add a longer description to this field'></textarea>",addButton:"<span class='symbol'><span class='fa fa-minus'></span></span> Section Break"})}.call(this),function(){Formbuilder.registerField("text",{order:0,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' />",edit:"<%= Formbuilder.templates['edit/size']() %>\n<%= Formbuilder.templates['edit/min_max_length']() %>",addButton:"<span class='symbol'><span class='fa fa-font'></span></span> Text",defaultAttributes:function(a){return a.field_options.size="small",a}})}.call(this),function(){Formbuilder.registerField("time",{order:25,view:"<div class='input-line'>\n  <span class='hours'>\n    <input type=\"text\" />\n    <label>HH</label>\n  </span>\n\n  <span class='above-line'>:</span>\n\n  <span class='minutes'>\n    <input type=\"text\" />\n    <label>MM</label>\n  </span>\n\n  <span class='above-line'>:</span>\n\n  <span class='seconds'>\n    <input type=\"text\" />\n    <label>SS</label>\n  </span>\n\n  <span class='am_pm'>\n    <select>\n      <option>AM</option>\n      <option>PM</option>\n    </select>\n  </span>\n</div>",edit:"",addButton:'<span class="symbol"><span class="fa fa-clock-o"></span></span> Time'})}.call(this),function(){Formbuilder.registerField("website",{order:35,view:"<input type='text' class='rf-size-<%= rf.get(Formbuilder.options.mappings.SIZE) %>' placeholder='http://' />",edit:"<%= Formbuilder.templates['edit/size']() %>",addButton:'<span class="symbol"><span class="fa fa-link"></span></span> Website'})}.call(this),this.Formbuilder=this.Formbuilder||{},this.Formbuilder.templates=this.Formbuilder.templates||{},this.Formbuilder.templates["edit/base"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["edit/base_header"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["edit/common"]())?"":__t)+"\n"+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].edit({rf:rf}))?"":__t)+"\n";return __p},this.Formbuilder.templates["edit/base_header"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-field-label'>\n  <span data-rv-text=\"model."+(null==(__t=Formbuilder.options.mappings.LABEL)?"":__t)+"\"></span>\n  <code class='field-type' data-rv-text='model."+(null==(__t=Formbuilder.options.mappings.FIELD_TYPE)?"":__t)+"'></code>\n  <span class='fa fa-arrow-right pull-right'></span>\n</div>";return __p},this.Formbuilder.templates["edit/base_non_input"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["edit/base_header"]())?"":__t)+"\n"+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].edit({rf:rf}))?"":__t)+"\n";return __p},this.Formbuilder.templates["edit/checkboxes"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.REQUIRED)?"":__t)+"' />\n  Required\n</label>\n<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.ADMIN_ONLY)?"":__t)+"' />\n  Admin only\n</label>";return __p},this.Formbuilder.templates["edit/common"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Label</div>\n\n<div class='fb-common-wrapper'>\n  <div class='fb-label-description'>\n    "+(null==(__t=Formbuilder.templates["edit/label_description"]())?"":__t)+"\n  </div>\n  <div class='fb-common-checkboxes'>\n    "+(null==(__t=Formbuilder.templates["edit/checkboxes"]())?"":__t)+"\n  </div>\n  <div class='fb-clear'></div>\n</div>\n";return __p},this.Formbuilder.templates["edit/integer_only"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Integer only</div>\n<label>\n  <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INTEGER_ONLY)?"":__t)+"' />\n  Only accept integers\n</label>\n";return __p},this.Formbuilder.templates["edit/label_description"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<input type='text' data-rv-input='model."+(null==(__t=Formbuilder.options.mappings.LABEL)?"":__t)+"' />\n<textarea data-rv-input='model."+(null==(__t=Formbuilder.options.mappings.DESCRIPTION)?"":__t)+"'\n  placeholder='Add a longer description to this field'></textarea>";return __p},this.Formbuilder.templates["edit/min_max"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Minimum / Maximum</div>\n\nAbove\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MIN)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\nBelow\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MAX)?"":__t)+'" style="width: 30px" />\n';return __p},this.Formbuilder.templates["edit/min_max_length"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Length Limit</div>\n\nMin\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MINLENGTH)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\nMax\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.MAXLENGTH)?"":__t)+'" style="width: 30px" />\n\n&nbsp;&nbsp;\n\n<select data-rv-value="model.'+(null==(__t=Formbuilder.options.mappings.LENGTH_UNITS)?"":__t)+'" style="width: auto;">\n  <option value="characters">characters</option>\n  <option value="words">words</option>\n</select>\n';return __p},this.Formbuilder.templates["edit/options"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<div class='fb-edit-section-header'>Options</div>\n\n","undefined"!=typeof includeBlank&&(__p+="\n  <label>\n    <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INCLUDE_BLANK)?"":__t)+"' />\n    Include blank\n  </label>\n"),__p+="\n\n<div class='option' data-rv-each-option='model."+(null==(__t=Formbuilder.options.mappings.OPTIONS)?"":__t)+'\'>\n  <input type="checkbox" class=\'js-default-updated\' data-rv-checked="option:checked" />\n  <input type="text" data-rv-input="option:label" class=\'option-label-input\' />\n  <a class="js-add-option '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Add Option"><i class=\'fa fa-plus-circle\'></i></a>\n  <a class="js-remove-option '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Remove Option"><i class=\'fa fa-minus-circle\'></i></a>\n</div>\n\n',"undefined"!=typeof includeOther&&(__p+="\n  <label>\n    <input type='checkbox' data-rv-checked='model."+(null==(__t=Formbuilder.options.mappings.INCLUDE_OTHER)?"":__t)+'\' />\n    Include "other"\n  </label>\n'),__p+="\n\n<div class='fb-bottom-add'>\n  <a class=\"js-add-option "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">Add option</a>\n</div>\n';return __p},this.Formbuilder.templates["edit/size"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-edit-section-header'>Size</div>\n<select data-rv-value=\"model."+(null==(__t=Formbuilder.options.mappings.SIZE)?"":__t)+'">\n  <option value="small">Small</option>\n  <option value="medium">Medium</option>\n  <option value="large">Large</option>\n</select>\n';return __p},this.Formbuilder.templates["edit/units"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+='<div class=\'fb-edit-section-header\'>Units</div>\n<input type="text" data-rv-input="model.'+(null==(__t=Formbuilder.options.mappings.UNITS)?"":__t)+'" />\n';return __p},this.Formbuilder.templates.page=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+=(null==(__t=Formbuilder.templates["partials/save_button"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["partials/left_side"]())?"":__t)+"\n"+(null==(__t=Formbuilder.templates["partials/right_side"]())?"":__t)+"\n<div class='fb-clear'></div>";return __p},this.Formbuilder.templates["partials/add_field"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<div class='fb-tab-pane active' id='addField'>\n  <div class='fb-add-field-types'>\n    <div class='section'>\n      ",_.each(_.sortBy(Formbuilder.inputFields,"order"),function(a){__p+='\n        <a data-field-type="'+(null==(__t=a.field_type)?"":__t)+'" class="'+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">\n          '+(null==(__t=a.addButton)?"":__t)+"\n        </a>\n      "}),__p+="\n    </div>\n\n    <div class='section'>\n      ",_.each(_.sortBy(Formbuilder.nonInputFields,"order"),function(a){__p+='\n        <a data-field-type="'+(null==(__t=a.field_type)?"":__t)+'" class="'+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'">\n          '+(null==(__t=a.addButton)?"":__t)+"\n        </a>\n      "}),__p+="\n    </div>\n  </div>\n</div>";return __p},this.Formbuilder.templates["partials/edit_field"]=function(obj){obj||(obj={});var __p="";with(_.escape,obj)__p+="<div class='fb-tab-pane' id='editField'>\n  <div class='fb-edit-field-wrapper'></div>\n</div>\n";return __p},this.Formbuilder.templates["partials/left_side"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-left'>\n  <ul class='fb-tabs'>\n    <li class='active'><a data-target='#addField'>Add new field</a></li>\n    <li><a data-target='#editField'>Edit field</a></li>\n  </ul>\n\n  <div class='fb-tab-content'>\n    "+(null==(__t=Formbuilder.templates["partials/add_field"]())?"":__t)+"\n    "+(null==(__t=Formbuilder.templates["partials/edit_field"]())?"":__t)+"\n  </div>\n</div>";return __p},this.Formbuilder.templates["partials/right_side"]=function(obj){obj||(obj={});var __p="";with(_.escape,obj)__p+="<div class='fb-right'>\n  <div class='fb-no-response-fields'>No response fields</div>\n  <div class='fb-response-fields'></div>\n</div>\n";return __p},this.Formbuilder.templates["partials/save_button"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='fb-save-wrapper'>\n  <button class='js-save-form "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+"'></button>\n</div>";return __p},this.Formbuilder.templates["view/base"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='subtemplate-wrapper'>\n  <div class='cover'></div>\n  "+(null==(__t=Formbuilder.templates["view/label"]({rf:rf}))?"":__t)+"\n\n  "+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].view({rf:rf}))?"":__t)+"\n\n  "+(null==(__t=Formbuilder.templates["view/description"]({rf:rf}))?"":__t)+"\n  "+(null==(__t=Formbuilder.templates["view/duplicate_remove"]({rf:rf}))?"":__t)+"\n</div>\n";return __p},this.Formbuilder.templates["view/base_non_input"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='subtemplate-wrapper'>\n  <div class='cover'></div>\n  "+(null==(__t=Formbuilder.fields[rf.get(Formbuilder.options.mappings.FIELD_TYPE)].view({rf:rf}))?"":__t)+"\n  "+(null==(__t=Formbuilder.templates["view/duplicate_remove"]({rf:rf}))?"":__t)+"\n</div>\n";return __p},this.Formbuilder.templates["view/description"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<span class='help-block'>\n  "+(null==(__t=Formbuilder.helpers.simple_format(rf.get(Formbuilder.options.mappings.DESCRIPTION)))?"":__t)+"\n</span>\n";return __p},this.Formbuilder.templates["view/duplicate_remove"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,obj)__p+="<div class='actions-wrapper'>\n  <a class=\"js-duplicate "+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Duplicate Field"><i class=\'fa fa-plus-circle\'></i></a>\n  <a class="js-clear '+(null==(__t=Formbuilder.options.BUTTON_CLASS)?"":__t)+'" title="Remove Field"><i class=\'fa fa-minus-circle\'></i></a>\n</div>';return __p},this.Formbuilder.templates["view/label"]=function(obj){obj||(obj={});var __t,__p="";with(_.escape,Array.prototype.join,obj)__p+="<label>\n  <span>"+(null==(__t=Formbuilder.helpers.simple_format(rf.get(Formbuilder.options.mappings.LABEL)))?"":__t)+"\n  ",rf.get(Formbuilder.options.mappings.REQUIRED)&&(__p+="\n    <abbr title='required'>*</abbr>\n  "),__p+="\n</label>\n";return __p};
\ No newline at end of file
diff --git a/formbuilder.js b/formbuilder.js
index 17687c27..99c5f148 100644
--- a/formbuilder.js
+++ b/formbuilder.js
@@ -147,8 +147,8 @@
           'click .js-duplicate': 'duplicate',
           'click .js-clear': 'clear'
         },
-        initialize: function() {
-          this.parentView = this.options.parentView;
+        initialize: function(options) {
+          this.parentView = options.parentView;
           this.listenTo(this.model, "change", this.render);
           return this.listenTo(this.model, "destroy", this.remove);
         },
@@ -183,7 +183,8 @@
           'click .js-default-updated': 'defaultUpdated',
           'input .option-label-input': 'forceRender'
         },
-        initialize: function() {
+        initialize: function(options) {
+          this.parentView = options.parentView;
           return this.listenTo(this.model, "destroy", this.remove);
         },
         render: function() {
@@ -196,8 +197,8 @@
           return this;
         },
         remove: function() {
-          this.options.parentView.editView = void 0;
-          this.options.parentView.$el.find("[data-target=\"#addField\"]").click();
+          this.parentView.editView = void 0;
+          this.parentView.$el.find("[data-target=\"#addField\"]").click();
           return Backbone.View.prototype.remove.call(this);
         },
         addOption: function(e) {
@@ -247,9 +248,12 @@
           'click .fb-tabs a': 'showTab',
           'click .fb-add-field-types a': 'addField'
         },
-        initialize: function() {
-          this.$el = $(this.options.selector);
-          this.formBuilder = this.options.formBuilder;
+        initialize: function(options) {
+          var selector;
+          selector = options.selector, this.formBuilder = options.formBuilder, this.bootstrapData = options.bootstrapData;
+          if (selector != null) {
+            this.setElement($(selector));
+          }
           this.collection = new Formbuilder.collection;
           this.collection.bind('add', this.addOne, this);
           this.collection.bind('reset', this.reset, this);
@@ -257,7 +261,7 @@
           this.collection.bind('destroy add reset', this.hideShowNoResponseFields, this);
           this.collection.bind('destroy', this.ensureEditViewScrolled, this);
           this.render();
-          this.collection.reset(this.options.bootstrapData);
+          this.collection.reset(this.bootstrapData);
           return this.initAutosave();
         },
         initAutosave: function() {
@@ -499,16 +503,16 @@
       })
     };
 
-    function Formbuilder(selector, opts) {
+    function Formbuilder(opts) {
+      var args;
       if (opts == null) {
         opts = {};
       }
       _.extend(this, Backbone.Events);
-      this.mainView = new Formbuilder.views.main(_.extend({
-        selector: selector
-      }, opts, {
+      args = _.extend(opts, {
         formBuilder: this
-      }));
+      });
+      this.mainView = new Formbuilder.views.main(args);
     }
 
     return Formbuilder;
diff --git a/index.html b/index.html
index 725ffa34..f2dc248f 100644
--- a/index.html
+++ b/index.html
@@ -53,7 +53,8 @@
 
   <script>
     $(function(){
-      fb = new Formbuilder('.fb-main', {
+      fb = new Formbuilder({
+        selector: '.fb-main',
         bootstrapData: [{"label":"Please enter your clearance number","field_type":"text","required":true,"field_options":{},"cid":"c6"},{"label":"Security personnel #82?","field_type":"radio","required":true,"field_options":{"options":[{"label":"Yes","checked":false},{"label":"No","checked":false}],"include_other_option":true},"cid":"c10"},{"label":"Medical history","field_type":"file","required":true,"field_options":{},"cid":"c14"}]
       });
 
diff --git a/package.json b/package.json
index bffbbfb7..f35fc2ec 100644
--- a/package.json
+++ b/package.json
@@ -7,17 +7,27 @@
   ],
   "description": "Graphical form builder for the web.",
   "main": "Gruntfile.coffee",
-  "dependencies": {
-    "grunt": "*",
-    "grunt-contrib-concat": "*",
-    "grunt-contrib-coffee": "*",
-    "grunt-contrib-cssmin": "*",
-    "grunt-contrib-jst": "*",
-    "grunt-contrib-stylus": "*",
-    "grunt-contrib-uglify": "*",
-    "grunt-contrib-watch": "*"
+  "scripts": {
+    "test": "grunt test",
   },
   "devDependencies": {
-    "grunt-release": "~0.6.0"
+    "grunt": "~0.4.1",
+    "grunt-contrib-concat": "~0.3.0",
+    "grunt-contrib-coffee": "~0.7.0",
+    "grunt-contrib-cssmin": "~0.6.2",
+    "grunt-contrib-jst": "~0.5.1",
+    "grunt-contrib-stylus": "~0.9.0",
+    "grunt-contrib-uglify": "~0.2.5",
+    "grunt-contrib-watch": "~0.5.3",
+    "grunt-release": "~0.6.0",
+    "grunt-karma": "~0.6.2",
+    "karma": "~0.10.4",
+    "mocha": "~1.13.0",
+    "karma-mocha": "~0.1.0",
+    "karma-safari-launcher": "~0.1.1",
+    "karma-chrome-launcher": "~0.1.0",
+    "karma-firefox-launcher": "~0.1.0",
+    "karma-phantomjs-launcher": "~0.1.0",
+    "karma-coffee-preprocessor": "~0.1.0"
   }
 }
diff --git a/test/helpers.coffee b/test/helpers.coffee
new file mode 100644
index 00000000..7e69c53d
--- /dev/null
+++ b/test/helpers.coffee
@@ -0,0 +1,5 @@
+# Create `window.describe` etc. for our BDD-like tests.
+mocha.setup ui: 'bdd'
+
+# Create another global variable for simpler syntax.
+window.expect = chai.expect
diff --git a/test/karma.conf.coffee b/test/karma.conf.coffee
new file mode 100644
index 00000000..09206e02
--- /dev/null
+++ b/test/karma.conf.coffee
@@ -0,0 +1,80 @@
+# Karma configuration
+
+module.exports = (config) ->
+    config.set
+        # base path, that will be used to resolve files and exclude
+        basePath: '../'
+
+        # list of files / patterns to load in the browser
+        files: [
+            # Dependencies. Yes, I am aware this is lame.
+            'bower_components/jquery/jquery.js'
+            'bower_components/jquery-ui/ui/jquery.ui.core.js'
+            'bower_components/jquery-ui/ui/jquery.ui.widget.js'
+            'bower_components/jquery-ui/ui/jquery.ui.mouse.js'
+            'bower_components/jquery-ui/ui/jquery.ui.draggable.js'
+            'bower_components/jquery-ui/ui/jquery.ui.droppable.js'
+            'bower_components/jquery-ui/ui/jquery.ui.sortable.js'
+            'bower_components/jquery.scrollWindowTo/index.js'
+            'bower_components/underscore/underscore-min.js'
+            'bower_components/underscore.mixin.deepExtend/index.js'
+            'bower_components/rivets/dist/rivets.js'
+            'bower_components/backbone/backbone.js'
+            'bower_components/backbone-deep-model/src/deep-model.js'
+
+            'dist/formbuilder-min.js'
+
+            'test/vendor/js/chai.js'
+            'test/vendor/js/sinon.js'
+
+            'test/vendor/js/chai-jquery.js'
+            'test/vendor/js/chai-changes.js'
+            'test/vendor/js/chai-backbone.js'
+            'test/vendor/js/sinon-chai.js'
+
+            'test/helpers.coffee'
+            'test/**/*_test.coffee'
+        ]
+
+        # web server port
+        port: 8080
+
+        # cli runner port
+        runnerPort: 9100
+
+        # enable / disable colors in the output (reporters and logs)
+        colors: yes
+
+        # level of logging
+        # possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
+        logLevel: config.LOG_INFO
+
+        # enable / disable watching file and executing tests whenever any file changes
+        autoWatch: no
+
+        # Start these browsers, currently available:
+        # - Chrome
+        # - ChromeCanary
+        # - Firefox
+        # - Opera
+        # - Safari
+        # - PhantomJS
+        browsers: ['PhantomJS']
+
+        # Continuous Integration mode
+        # if true, it capture browsers, run tests and exit
+        # singleRun: yes
+
+        # compile coffee scripts
+        preprocessors: '**/*.coffee': 'coffee'
+
+        frameworks: ['mocha']
+
+        plugins: [
+            'karma-mocha',
+            'karma-coffee-preprocessor',
+            'karma-phantomjs-launcher',
+            'karma-chrome-launcher',
+            'karma-firefox-launcher',
+            'karma-safari-launcher'
+        ]
diff --git a/test/vendor/js/chai-backbone.js b/test/vendor/js/chai-backbone.js
new file mode 100644
index 00000000..1ecb7447
--- /dev/null
+++ b/test/vendor/js/chai-backbone.js
@@ -0,0 +1,110 @@
+// Generated by CoffeeScript 1.4.0
+(function() {
+
+  (function(chaiBackbone) {
+    if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
+      return module.exports = chaiBackbone;
+    } else if (typeof define === "function" && define.amd) {
+      return define(function() {
+        return chaiBackbone;
+      });
+    } else {
+      return chai.use(chaiBackbone);
+    }
+  })(function(chai, utils) {
+    var flag, inspect, routeTo;
+    inspect = utils.inspect;
+    flag = utils.flag;
+    chai.Assertion.addMethod('trigger', function(trigger, options) {
+      var definedActions;
+      if (options == null) {
+        options = {};
+      }
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          this.callback = sinon.spy();
+          return flag(context, 'object').on(trigger, this.callback);
+        },
+        after: function(context) {
+          var negate, _ref;
+          negate = flag(context, 'negate');
+          flag(context, 'negate', this.negate);
+          context.assert(this.callback.called, "expected to trigger " + trigger, "expected not to trigger " + trigger);
+          if (options["with"] != null) {
+            context.assert((_ref = this.callback).calledWith.apply(_ref, options["with"]), "expected trigger to be called with " + (inspect(options["with"])) + ", but was called with " + (inspect(this.callback.args[0])) + ".", "expected trigger not to be called with " + (inspect(options["with"])) + ", but was");
+          }
+          return flag(context, 'negate', negate);
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    });
+    chai.Assertion.addProperty('route', function() {
+      return flag(this, 'routing', true);
+    });
+    routeTo = function(router, methodName, options) {
+      var consideredRouter, current_history, route, stub, _i, _len, _ref;
+      if (options == null) {
+        options = {};
+      }
+      if (!((typeof router === 'object') && (router instanceof Backbone.Router))) {
+        throw new TypeError('provided router is not a Backbone.Router');
+      }
+      current_history = Backbone.history;
+      Backbone.history = new Backbone.History;
+      stub = sinon.stub(router, methodName);
+      router._bindRoutes();
+      if (options.considering != null) {
+        _ref = options.considering;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          consideredRouter = _ref[_i];
+          consideredRouter._bindRoutes();
+        }
+      }
+      Backbone.history.options = {
+        root: '/'
+      };
+      route = flag(this, 'object');
+      Backbone.history.loadUrl(route);
+      Backbone.history = current_history;
+      router[methodName].restore();
+      this.assert(stub.calledOnce, "expected `" + route + "` to route to " + methodName, "expected `" + route + "` not to route to " + methodName);
+      if (options["arguments"] != null) {
+        return this.assert(stub.calledWith.apply(stub, options["arguments"]), "expected `" + methodName + "` to be called with " + (inspect(options["arguments"])) + ", but was called with " + (inspect(stub.args[0])) + " instead", "expected `" + methodName + "` not to be called with " + (inspect(options["arguments"])) + ", but was");
+      }
+    };
+    chai.Assertion.overwriteProperty('to', function(_super) {
+      return function() {
+        if (flag(this, 'routing')) {
+          return routeTo;
+        } else {
+          return _super.apply(this, arguments);
+        }
+      };
+    });
+    return chai.Assertion.addMethod('call', function(methodName) {
+      var definedActions, object;
+      object = flag(this, 'object');
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          this.originalMethod = object[methodName];
+          this.spy = sinon.spy();
+          object[methodName] = this.spy;
+          return typeof object.delegateEvents === "function" ? object.delegateEvents() : void 0;
+        },
+        after: function(context) {
+          object[methodName] = this.originalMethod;
+          if (typeof object.delegateEvents === "function") {
+            object.delegateEvents();
+          }
+          return context.assert(this.spy.callCount > 0, this.spy.printf("expected %n to have been called at least once"), this.spy.printf("expected %n to not have been called"));
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    });
+  });
+
+}).call(this);
diff --git a/test/vendor/js/chai-changes.js b/test/vendor/js/chai-changes.js
new file mode 100644
index 00000000..a47479b7
--- /dev/null
+++ b/test/vendor/js/chai-changes.js
@@ -0,0 +1,316 @@
+// Generated by CoffeeScript 1.3.3
+(function() {
+
+  (function(chaiChanges) {
+    if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
+      return module.exports = chaiChanges;
+    } else if (typeof define === "function" && define.amd) {
+      return define(function() {
+        return chaiChanges;
+      });
+    } else {
+      return chai.use(chaiChanges);
+    }
+  })(function(chai, utils) {
+    var byAtLeast, byAtMost, changeBy, changeByAssert, changeFrom, changeFromAssert, changeFromBeginAssert, changeTo, changeToAssert, changeToBeginAssert, flag, formatFunction, inspect, noChangeAssert;
+    inspect = utils.inspect;
+    flag = utils.flag;
+    chai.Assertion.addMethod('when', function(val, options) {
+      var action, definedActions, done, isPromise, newPromise, object, promiseCallback, result, _i, _j, _len, _len1,
+        _this = this;
+      if (options == null) {
+        options = {};
+      }
+      definedActions = flag(this, 'whenActions') || [];
+      object = flag(this, 'object');
+      flag(this, 'whenObject', object);
+      for (_i = 0, _len = definedActions.length; _i < _len; _i++) {
+        action = definedActions[_i];
+        if (typeof action.before === "function") {
+          action.before(this);
+        }
+      }
+      result = val();
+      isPromise = (typeof result === 'object') && (typeof result.then === 'function');
+      if (isPromise) {
+        done = options != null ? options.notify : void 0;
+        if (done == null) {
+          done = function() {};
+        }
+        promiseCallback = function() {
+          var _j, _len1;
+          try {
+            for (_j = 0, _len1 = definedActions.length; _j < _len1; _j++) {
+              action = definedActions[_j];
+              if (typeof action.after === "function") {
+                action.after(_this);
+              }
+            }
+            return done();
+          } catch (error) {
+            done(error);
+            throw error;
+          }
+        };
+        newPromise = result.then(promiseCallback, promiseCallback);
+        return newPromise;
+      } else {
+        for (_j = 0, _len1 = definedActions.length; _j < _len1; _j++) {
+          action = definedActions[_j];
+          if (typeof action.after === "function") {
+            action.after(this);
+          }
+        }
+      }
+      return this;
+    });
+    noChangeAssert = function(context) {
+      var endValue, negate, object, relevant, result, startValue;
+      relevant = flag(context, 'no-change');
+      if (!relevant) {
+        return;
+      }
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = flag(context, 'changeStart');
+      endValue = object();
+      result = !utils.eql(endValue, startValue);
+      context.assert(result, "expected `" + (formatFunction(object)) + "` to change, but it stayed " + (utils.inspect(startValue)), "expected `" + (formatFunction(object)) + "` not to change, but it changed from " + (utils.inspect(startValue)) + " to " + (utils.inspect(endValue)));
+      return flag(context, 'negate', negate);
+    };
+    changeByAssert = function(context) {
+      var actualDelta, endValue, negate, object, startValue;
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = flag(context, 'changeStart');
+      endValue = object();
+      actualDelta = endValue - startValue;
+      context.assert(this.expectedDelta === actualDelta, "expected `" + (formatFunction(object)) + "` to change by " + this.expectedDelta + ", but it changed by " + actualDelta, "expected `" + (formatFunction(object)) + "` not to change by " + this.expectedDelta + ", but it did");
+      return flag(context, 'negate', negate);
+    };
+    changeToBeginAssert = function(context) {
+      var negate, object, result, startValue;
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = object();
+      flag(context, 'changeToStart', startValue);
+      result = !utils.eql(startValue, this.expectedEndValue);
+      if (negate) {
+        result = !result;
+      }
+      context.assert(result, "expected `" + (formatFunction(object)) + "` to change to " + (utils.inspect(this.expectedEndValue)) + ", but it was already " + (utils.inspect(startValue)), "not supported");
+      return flag(context, 'negate', negate);
+    };
+    changeToAssert = function(context) {
+      var changed, endValue, negate, object, result, startValue;
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = flag(context, 'changeToStart');
+      endValue = object();
+      if (!negate) {
+        changed = !utils.eql(startValue, endValue);
+        context.assert(changed, "expected `" + (formatFunction(object)) + "` to change to " + (utils.inspect(this.expectedEndValue)) + ", but it did not change from " + (utils.inspect(startValue)), "not supported");
+      }
+      result = utils.eql(endValue, this.expectedEndValue);
+      context.assert(result, "expected `" + (formatFunction(object)) + "` to change to " + (utils.inspect(this.expectedEndValue)) + ", but it changed to " + (utils.inspect(endValue)), "expected `" + (formatFunction(object)) + "` not to change to " + (utils.inspect(this.expectedEndValue)) + ", but it did");
+      return flag(context, 'negate', negate);
+    };
+    changeFromBeginAssert = function(context) {
+      var negate, object, result, startValue;
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = object();
+      result = utils.eql(startValue, this.expectedStartValue);
+      context.assert(result, "expected the change of `" + (formatFunction(object)) + "` to start from " + (utils.inspect(this.expectedStartValue)) + ", but it started from " + (utils.inspect(startValue)), "expected the change of `" + (formatFunction(object)) + "` not to start from " + (utils.inspect(this.expectedStartValue)) + ", but it did");
+      return flag(context, 'negate', negate);
+    };
+    changeFromAssert = function(context) {
+      var endValue, negate, object, result, startValue;
+      negate = flag(context, 'negate');
+      flag(context, 'negate', this.negate);
+      object = flag(context, 'whenObject');
+      startValue = flag(context, 'changeStart');
+      endValue = object();
+      result = !utils.eql(startValue, endValue);
+      if (negate) {
+        result = !result;
+      }
+      context.assert(result, "expected `" + (formatFunction(object)) + "` to change from " + (utils.inspect(this.expectedStartValue)) + ", but it did not change", "not supported");
+      return flag(context, 'negate', negate);
+    };
+    chai.Assertion.addProperty('change', function() {
+      var definedActions;
+      flag(this, 'no-change', true);
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          var startValue;
+          startValue = flag(context, 'whenObject')();
+          return flag(context, 'changeStart', startValue);
+        },
+        after: noChangeAssert
+      });
+      return flag(this, 'whenActions', definedActions);
+    });
+    chai.Assertion.addProperty('increase', function() {
+      var definedActions;
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          var startValue;
+          startValue = flag(context, 'whenObject')();
+          return flag(context, 'increaseStart', startValue);
+        },
+        after: function(context) {
+          var endValue, negate, object, startValue;
+          object = flag(context, 'whenObject');
+          endValue = object();
+          startValue = flag(context, 'increaseStart');
+          negate = flag(context, 'negate');
+          flag(context, 'negate', this.negate);
+          if (!negate) {
+            context.assert(startValue !== endValue, "expected `" + (formatFunction(object)) + "` to increase, but it did not change", "not supported");
+          }
+          context.assert(startValue < endValue, "expected `" + (formatFunction(object)) + "` to increase, but it decreased by " + (startValue - endValue), "expected `" + (formatFunction(object)) + "` not to increase, but it increased by " + (endValue - startValue));
+          return flag(context, 'negate', negate);
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    });
+    chai.Assertion.addProperty('decrease', function() {
+      var definedActions;
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          var startValue;
+          startValue = flag(context, 'whenObject')();
+          return flag(context, 'decreaseStart', startValue);
+        },
+        after: function(context) {
+          var endValue, negate, object, startValue;
+          object = flag(context, 'whenObject');
+          endValue = object();
+          startValue = flag(context, 'decreaseStart');
+          negate = flag(context, 'negate');
+          flag(context, 'negate', this.negate);
+          if (!negate) {
+            context.assert(startValue !== endValue, "expected `" + (formatFunction(object)) + "` to decrease, but it did not change", "not supported");
+          }
+          context.assert(startValue > endValue, "expected `" + (formatFunction(object)) + "` to decrease, but it increased by " + (endValue - startValue), "expected `" + (formatFunction(object)) + "` not to decrease, but it decreased by " + (startValue - endValue));
+          return flag(context, 'negate', negate);
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    });
+    byAtLeast = function(amount) {
+      var definedActions;
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          var startValue;
+          startValue = flag(context, 'whenObject')();
+          return flag(context, 'atLeastStart', startValue);
+        },
+        after: function(context) {
+          var difference, endValue, negate, object, startValue;
+          object = flag(context, 'whenObject');
+          endValue = object();
+          startValue = flag(context, 'atLeastStart');
+          negate = flag(context, 'negate');
+          flag(context, 'negate', this.negate);
+          difference = Math.abs(endValue - startValue);
+          context.assert(difference >= amount, "expected `" + (formatFunction(object)) + "` to change by at least " + amount + ", but changed by " + difference, "not supported");
+          return flag(context, 'negate', negate);
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    };
+    chai.Assertion.addChainableMethod('atLeast', byAtLeast, function() {
+      return this;
+    });
+    byAtMost = function(amount) {
+      var definedActions;
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        before: function(context) {
+          var startValue;
+          startValue = flag(context, 'whenObject')();
+          return flag(context, 'atMostStart', startValue);
+        },
+        after: function(context) {
+          var difference, endValue, negate, object, startValue;
+          object = flag(context, 'whenObject');
+          endValue = object();
+          startValue = flag(context, 'atMostStart');
+          negate = flag(context, 'negate');
+          flag(context, 'negate', this.negate);
+          difference = Math.abs(endValue - startValue);
+          context.assert(difference <= amount, "expected `" + (formatFunction(object)) + "` to change by at most " + amount + ", but changed by " + difference, "not supported");
+          return flag(context, 'negate', negate);
+        }
+      });
+      return flag(this, 'whenActions', definedActions);
+    };
+    chai.Assertion.addChainableMethod('atMost', byAtMost, function() {
+      return this;
+    });
+    formatFunction = function(func) {
+      return func.toString().replace(/^\s*function \(\) {\s*/, '').replace(/\s+}$/, '').replace(/\s*return\s*/, '');
+    };
+    changeBy = function(delta) {
+      var definedActions;
+      flag(this, 'no-change', false);
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        expectedDelta: delta,
+        after: changeByAssert
+      });
+      return flag(this, 'whenActions', definedActions);
+    };
+    chai.Assertion.addChainableMethod('by', changeBy, function() {
+      return this;
+    });
+    changeTo = function(endValue) {
+      var definedActions;
+      flag(this, 'no-change', false);
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        expectedEndValue: endValue,
+        before: changeToBeginAssert,
+        after: changeToAssert
+      });
+      return flag(this, 'whenActions', definedActions);
+    };
+    chai.Assertion.addChainableMethod('to', changeTo, function() {
+      return this;
+    });
+    changeFrom = function(startValue) {
+      var definedActions;
+      flag(this, 'no-change', false);
+      definedActions = flag(this, 'whenActions') || [];
+      definedActions.push({
+        negate: flag(this, 'negate'),
+        expectedStartValue: startValue,
+        before: changeFromBeginAssert,
+        after: changeFromAssert
+      });
+      return flag(this, 'whenActions', definedActions);
+    };
+    return chai.Assertion.addChainableMethod('from', changeFrom, function() {
+      return this;
+    });
+  });
+
+}).call(this);
diff --git a/test/vendor/js/chai-jquery.js b/test/vendor/js/chai-jquery.js
new file mode 100644
index 00000000..f29f2b1f
--- /dev/null
+++ b/test/vendor/js/chai-jquery.js
@@ -0,0 +1,237 @@
+(function (chaiJquery) {
+  // Module systems magic dance.
+  if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
+    // NodeJS
+    module.exports = chaiJquery;
+  } else if (typeof define === "function" && define.amd) {
+    // AMD
+    define(['jquery'], function ($) {
+      return function (chai, utils) {
+        return chaiJquery(chai, utils, $);
+      };
+    });
+  } else {
+    // Other environment (usually <script> tag): plug in to global chai instance directly.
+    chai.use(function (chai, utils) {
+      return chaiJquery(chai, utils, jQuery);
+    });
+  }
+}(function (chai, utils, $) {
+  var inspect = utils.inspect,
+      flag = utils.flag;
+  $ = $ || jQuery;
+
+  $.fn.inspect = function (depth) {
+    var el = $('<div />').append(this.clone());
+    if (depth !== undefined) {
+      var children = el.children();
+      while (depth-- > 0)
+        children = children.children();
+      children.html('...');
+    }
+    return el.html();
+  };
+
+  var props = {attr: 'attribute', css: 'CSS property'};
+  for (var prop in props) {
+    (function (prop, description) {
+      chai.Assertion.addMethod(prop, function (name, val) {
+        var actual = flag(this, 'object')[prop](name);
+
+        if (!flag(this, 'negate') || undefined === val) {
+          this.assert(
+              undefined !== actual
+            , 'expected #{this} to have a #{exp} ' + description
+            , 'expected #{this} not to have a #{exp} ' + description
+            , name
+          );
+        }
+
+        if (undefined !== val) {
+          this.assert(
+              val === actual
+            , 'expected #{this} to have a ' + inspect(name) + ' ' + description + ' with the value #{exp}, but the value was #{act}'
+            , 'expected #{this} not to have a ' + inspect(name) + ' ' + description + ' with the value #{act}'
+            , val
+            , actual
+          );
+        }
+
+        flag(this, 'object', actual);
+      });
+    })(prop, props[prop]);
+  }
+
+  chai.Assertion.addMethod('data', function (name, val) {
+    // Work around a chai bug (https://github.com/logicalparadox/chai/issues/16)
+    if (flag(this, 'negate') && undefined !== val && undefined === flag(this, 'object').data(name)) {
+      return;
+    }
+
+    var assertion = new chai.Assertion(flag(this, 'object').data());
+    if (flag(this, 'negate'))
+      assertion = assertion.not;
+    return assertion.property(name, val);
+  });
+
+  chai.Assertion.addMethod('class', function (className) {
+    this.assert(
+        flag(this, 'object').hasClass(className)
+      , 'expected #{this} to have class #{exp}'
+      , 'expected #{this} not to have class #{exp}'
+      , className
+    );
+  });
+
+  chai.Assertion.addMethod('id', function (id) {
+    this.assert(
+        flag(this, 'object').attr('id') === id
+      , 'expected #{this} to have id #{exp}'
+      , 'expected #{this} not to have id #{exp}'
+      , id
+    );
+  });
+
+  chai.Assertion.addMethod('html', function (html) {
+    this.assert(
+        flag(this, 'object').html() === html
+      , 'expected #{this} to have HTML #{exp}'
+      , 'expected #{this} not to have HTML #{exp}'
+      , html
+    );
+  });
+
+  chai.Assertion.addMethod('text', function (text) {
+    this.assert(
+        flag(this, 'object').text() === text
+      , 'expected #{this} to have text #{exp}'
+      , 'expected #{this} not to have text #{exp}'
+      , text
+    );
+  });
+
+  chai.Assertion.addMethod('value', function (value) {
+    this.assert(
+        flag(this, 'object').val() === value
+      , 'expected #{this} to have value #{exp}'
+      , 'expected #{this} not to have value #{exp}'
+      , value
+    );
+  });
+
+  $.each(['visible', 'hidden', 'selected', 'checked', 'disabled'], function (i, attr) {
+    chai.Assertion.addProperty(attr, function () {
+      this.assert(
+          flag(this, 'object').is(':' + attr)
+        , 'expected #{this} to be ' + attr
+        , 'expected #{this} not to be ' + attr);
+    });
+  });
+
+  chai.Assertion.overwriteProperty('exist', function (_super) {
+    return function () {
+      var obj = flag(this, 'object');
+      if (obj instanceof $) {
+        this.assert(
+            obj.length > 0
+          , 'expected ' + inspect(obj.selector) + ' to exist'
+          , 'expected ' + inspect(obj.selector) + ' not to exist');
+      } else {
+        _super.apply(this, arguments);
+      }
+    };
+  });
+
+  chai.Assertion.overwriteProperty('empty', function (_super) {
+    return function () {
+      var obj = flag(this, 'object');
+      if (obj instanceof $) {
+        this.assert(
+          obj.is(':empty')
+          , 'expected #{this} to be empty'
+          , 'expected #{this} not to be empty');
+      } else {
+        _super.apply(this, arguments);
+      }
+    };
+  });
+
+  chai.Assertion.overwriteProperty('be', function (_super) {
+    return function () {
+      var be = function (selector) {
+        var obj = flag(this, 'object');
+        if (obj instanceof $) {
+          this.assert(
+              obj.is(selector)
+            , 'expected #{this} to be #{exp}'
+            , 'expected #{this} not to be #{exp}'
+            , selector
+          );
+        } else {
+          _super.apply(this, arguments);
+        }
+      };
+      be.__proto__ = this;
+      return be;
+    }
+  });
+
+  chai.Assertion.overwriteMethod('match', function (_super) {
+    return function (selector) {
+      var obj = flag(this, 'object');
+      if (obj instanceof $) {
+        this.assert(
+            obj.is(selector)
+          , 'expected #{this} to match #{exp}'
+          , 'expected #{this} not to match #{exp}'
+          , selector
+        );
+      } else {
+        _super.apply(this, arguments);
+      }
+    }
+  });
+
+  chai.Assertion.overwriteProperty('contain', function (_super) {
+    return function () {
+      _super.call(this);
+      var contain = function (text) {
+        var obj = flag(this, 'object');
+        if (obj instanceof $) {
+          this.assert(
+              obj.is(':contains(\'' + text + '\')')
+            , 'expected #{this} to contain #{exp}'
+            , 'expected #{this} not to contain #{exp}'
+            , text
+          );
+        } else {
+          Function.prototype.apply.call(_super.call(this), this, arguments);
+        }
+      };
+      contain.__proto__ = this;
+      return contain;
+    }
+  });
+
+  chai.Assertion.overwriteProperty('have', function (_super) {
+    return function () {
+      var obj = flag(this, 'object');
+      if (obj instanceof $) {
+        var have = function (selector) {
+          this.assert(
+              // Using find() rather than has() to work around a jQuery bug:
+              //   http://bugs.jquery.com/ticket/11706
+              obj.find(selector).length > 0
+            , 'expected #{this} to have #{exp}'
+            , 'expected #{this} not to have #{exp}'
+            , selector
+          );
+        };
+        have.__proto__ = this;
+        return have;
+      } else {
+        _super.call(this);
+      }
+    }
+  });
+}));
diff --git a/test/vendor/js/chai.js b/test/vendor/js/chai.js
new file mode 100755
index 00000000..cb6b3d3c
--- /dev/null
+++ b/test/vendor/js/chai.js
@@ -0,0 +1,3996 @@
+!function (name, context, definition) {
+  if (typeof require === 'function' && typeof exports === 'object' && typeof module === 'object') {
+    module.exports = definition();
+  } else if (typeof define === 'function' && typeof define.amd  === 'object') {
+    define(function () {
+      return definition();
+    });
+  } else {
+    context[name] = definition();
+  }
+}('chai', this, function () {
+
+  function require(p) {
+    var path = require.resolve(p)
+      , mod = require.modules[path];
+    if (!mod) throw new Error('failed to require "' + p + '"');
+    if (!mod.exports) {
+      mod.exports = {};
+      mod.call(mod.exports, mod, mod.exports, require.relative(path));
+    }
+    return mod.exports;
+  }
+
+  require.modules = {};
+
+  require.resolve = function (path) {
+    var orig = path
+      , reg = path + '.js'
+      , index = path + '/index.js';
+    return require.modules[reg] && reg
+      || require.modules[index] && index
+      || orig;
+  };
+
+  require.register = function (path, fn) {
+    require.modules[path] = fn;
+  };
+
+  require.relative = function (parent) {
+    return function(p){
+      if ('.' != p.charAt(0)) return require(p);
+
+      var path = parent.split('/')
+        , segs = p.split('/');
+      path.pop();
+
+      for (var i = 0; i < segs.length; i++) {
+        var seg = segs[i];
+        if ('..' == seg) path.pop();
+        else if ('.' != seg) path.push(seg);
+      }
+
+      return require(path.join('/'));
+    };
+  };
+
+  require.alias = function (from, to) {
+    var fn = require.modules[from];
+    require.modules[to] = fn;
+  };
+
+
+  require.register("chai.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    var used = []
+      , exports = module.exports = {};
+
+    /*!
+     * Chai version
+     */
+
+    exports.version = '1.5.0';
+
+    /*!
+     * Primary `Assertion` prototype
+     */
+
+    exports.Assertion = require('./chai/assertion');
+
+    /*!
+     * Assertion Error
+     */
+
+    exports.AssertionError = require('./chai/error');
+
+    /*!
+     * Utils for plugins (not exported)
+     */
+
+    var util = require('./chai/utils');
+
+    /**
+     * # .use(function)
+     *
+     * Provides a way to extend the internals of Chai
+     *
+     * @param {Function}
+     * @returns {this} for chaining
+     * @api public
+     */
+
+    exports.use = function (fn) {
+      if (!~used.indexOf(fn)) {
+        fn(this, util);
+        used.push(fn);
+      }
+
+      return this;
+    };
+
+    /*!
+     * Core Assertions
+     */
+
+    var core = require('./chai/core/assertions');
+    exports.use(core);
+
+    /*!
+     * Expect interface
+     */
+
+    var expect = require('./chai/interface/expect');
+    exports.use(expect);
+
+    /*!
+     * Should interface
+     */
+
+    var should = require('./chai/interface/should');
+    exports.use(should);
+
+    /*!
+     * Assert interface
+     */
+
+    var assert = require('./chai/interface/assert');
+    exports.use(assert);
+
+  }); // module: chai.js
+
+  require.register("chai/assertion.js", function(module, exports, require){
+    /*!
+     * chai
+     * http://chaijs.com
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Module dependencies.
+     */
+
+    var AssertionError = require('./error')
+      , util = require('./utils')
+      , flag = util.flag;
+
+    /*!
+     * Module export.
+     */
+
+    module.exports = Assertion;
+
+
+    /*!
+     * Assertion Constructor
+     *
+     * Creates object for chaining.
+     *
+     * @api private
+     */
+
+    function Assertion (obj, msg, stack) {
+      flag(this, 'ssfi', stack || arguments.callee);
+      flag(this, 'object', obj);
+      flag(this, 'message', msg);
+    }
+
+    /*!
+      * ### Assertion.includeStack
+      *
+      * User configurable property, influences whether stack trace
+      * is included in Assertion error message. Default of false
+      * suppresses stack trace in the error message
+      *
+      *     Assertion.includeStack = true;  // enable stack on error
+      *
+      * @api public
+      */
+
+    Assertion.includeStack = false;
+
+    /*!
+     * ### Assertion.showDiff
+     *
+     * User configurable property, influences whether or not
+     * the `showDiff` flag should be included in the thrown
+     * AssertionErrors. `false` will always be `false`; `true`
+     * will be true when the assertion has requested a diff
+     * be shown.
+     *
+     * @api public
+     */
+
+    Assertion.showDiff = true;
+
+    Assertion.addProperty = function (name, fn) {
+      util.addProperty(this.prototype, name, fn);
+    };
+
+    Assertion.addMethod = function (name, fn) {
+      util.addMethod(this.prototype, name, fn);
+    };
+
+    Assertion.addChainableMethod = function (name, fn, chainingBehavior) {
+      util.addChainableMethod(this.prototype, name, fn, chainingBehavior);
+    };
+
+    Assertion.overwriteProperty = function (name, fn) {
+      util.overwriteProperty(this.prototype, name, fn);
+    };
+
+    Assertion.overwriteMethod = function (name, fn) {
+      util.overwriteMethod(this.prototype, name, fn);
+    };
+
+    /*!
+     * ### .assert(expression, message, negateMessage, expected, actual)
+     *
+     * Executes an expression and check expectations. Throws AssertionError for reporting if test doesn't pass.
+     *
+     * @name assert
+     * @param {Philosophical} expression to be tested
+     * @param {String} message to display if fails
+     * @param {String} negatedMessage to display if negated expression fails
+     * @param {Mixed} expected value (remember to check for negation)
+     * @param {Mixed} actual (optional) will default to `this.obj`
+     * @api private
+     */
+
+    Assertion.prototype.assert = function (expr, msg, negateMsg, expected, _actual, showDiff) {
+      var ok = util.test(this, arguments);
+      if (true !== showDiff) showDiff = false;
+      if (true !== Assertion.showDiff) showDiff = false;
+
+      if (!ok) {
+        var msg = util.getMessage(this, arguments)
+          , actual = util.getActual(this, arguments);
+        throw new AssertionError({
+            message: msg
+          , actual: actual
+          , expected: expected
+          , stackStartFunction: (Assertion.includeStack) ? this.assert : flag(this, 'ssfi')
+          , showDiff: showDiff
+        });
+      }
+    };
+
+    /*!
+     * ### ._obj
+     *
+     * Quick reference to stored `actual` value for plugin developers.
+     *
+     * @api private
+     */
+
+    Object.defineProperty(Assertion.prototype, '_obj',
+      { get: function () {
+          return flag(this, 'object');
+        }
+      , set: function (val) {
+          flag(this, 'object', val);
+        }
+    });
+
+  }); // module: chai/assertion.js
+
+  require.register("chai/core/assertions.js", function(module, exports, require){
+    /*!
+     * chai
+     * http://chaijs.com
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    module.exports = function (chai, _) {
+      var Assertion = chai.Assertion
+        , toString = Object.prototype.toString
+        , flag = _.flag;
+
+      /**
+       * ### Language Chains
+       *
+       * The following are provide as chainable getters to
+       * improve the readability of your assertions. They
+       * do not provide an testing capability unless they
+       * have been overwritten by a plugin.
+       *
+       * **Chains**
+       *
+       * - to
+       * - be
+       * - been
+       * - is
+       * - that
+       * - and
+       * - have
+       * - with
+       * - at
+       * - of
+       *
+       * @name language chains
+       * @api public
+       */
+
+      [ 'to', 'be', 'been'
+      , 'is', 'and', 'have'
+      , 'with', 'that', 'at'
+      , 'of' ].forEach(function (chain) {
+        Assertion.addProperty(chain, function () {
+          return this;
+        });
+      });
+
+      /**
+       * ### .not
+       *
+       * Negates any of assertions following in the chain.
+       *
+       *     expect(foo).to.not.equal('bar');
+       *     expect(goodFn).to.not.throw(Error);
+       *     expect({ foo: 'baz' }).to.have.property('foo')
+       *       .and.not.equal('bar');
+       *
+       * @name not
+       * @api public
+       */
+
+      Assertion.addProperty('not', function () {
+        flag(this, 'negate', true);
+      });
+
+      /**
+       * ### .deep
+       *
+       * Sets the `deep` flag, later used by the `equal` and
+       * `property` assertions.
+       *
+       *     expect(foo).to.deep.equal({ bar: 'baz' });
+       *     expect({ foo: { bar: { baz: 'quux' } } })
+       *       .to.have.deep.property('foo.bar.baz', 'quux');
+       *
+       * @name deep
+       * @api public
+       */
+
+      Assertion.addProperty('deep', function () {
+        flag(this, 'deep', true);
+      });
+
+      /**
+       * ### .a(type)
+       *
+       * The `a` and `an` assertions are aliases that can be
+       * used either as language chains or to assert a value's
+       * type.
+       *
+       *     // typeof
+       *     expect('test').to.be.a('string');
+       *     expect({ foo: 'bar' }).to.be.an('object');
+       *     expect(null).to.be.a('null');
+       *     expect(undefined).to.be.an('undefined');
+       *
+       *     // language chain
+       *     expect(foo).to.be.an.instanceof(Foo);
+       *
+       * @name a
+       * @alias an
+       * @param {String} type
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function an (type, msg) {
+        if (msg) flag(this, 'message', msg);
+        type = type.toLowerCase();
+        var obj = flag(this, 'object')
+          , article = ~[ 'a', 'e', 'i', 'o', 'u' ].indexOf(type.charAt(0)) ? 'an ' : 'a ';
+
+        this.assert(
+            type === _.type(obj)
+          , 'expected #{this} to be ' + article + type
+          , 'expected #{this} not to be ' + article + type
+        );
+      }
+
+      Assertion.addChainableMethod('an', an);
+      Assertion.addChainableMethod('a', an);
+
+      /**
+       * ### .include(value)
+       *
+       * The `include` and `contain` assertions can be used as either property
+       * based language chains or as methods to assert the inclusion of an object
+       * in an array or a substring in a string. When used as language chains,
+       * they toggle the `contain` flag for the `keys` assertion.
+       *
+       *     expect([1,2,3]).to.include(2);
+       *     expect('foobar').to.contain('foo');
+       *     expect({ foo: 'bar', hello: 'universe' }).to.include.keys('foo');
+       *
+       * @name include
+       * @alias contain
+       * @param {Object|String|Number} obj
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function includeChainingBehavior () {
+        flag(this, 'contains', true);
+      }
+
+      function include (val, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object')
+        this.assert(
+            ~obj.indexOf(val)
+          , 'expected #{this} to include ' + _.inspect(val)
+          , 'expected #{this} to not include ' + _.inspect(val));
+      }
+
+      Assertion.addChainableMethod('include', include, includeChainingBehavior);
+      Assertion.addChainableMethod('contain', include, includeChainingBehavior);
+
+      /**
+       * ### .ok
+       *
+       * Asserts that the target is truthy.
+       *
+       *     expect('everthing').to.be.ok;
+       *     expect(1).to.be.ok;
+       *     expect(false).to.not.be.ok;
+       *     expect(undefined).to.not.be.ok;
+       *     expect(null).to.not.be.ok;
+       *
+       * @name ok
+       * @api public
+       */
+
+      Assertion.addProperty('ok', function () {
+        this.assert(
+            flag(this, 'object')
+          , 'expected #{this} to be truthy'
+          , 'expected #{this} to be falsy');
+      });
+
+      /**
+       * ### .true
+       *
+       * Asserts that the target is `true`.
+       *
+       *     expect(true).to.be.true;
+       *     expect(1).to.not.be.true;
+       *
+       * @name true
+       * @api public
+       */
+
+      Assertion.addProperty('true', function () {
+        this.assert(
+            true === flag(this, 'object')
+          , 'expected #{this} to be true'
+          , 'expected #{this} to be false'
+          , this.negate ? false : true
+        );
+      });
+
+      /**
+       * ### .false
+       *
+       * Asserts that the target is `false`.
+       *
+       *     expect(false).to.be.false;
+       *     expect(0).to.not.be.false;
+       *
+       * @name false
+       * @api public
+       */
+
+      Assertion.addProperty('false', function () {
+        this.assert(
+            false === flag(this, 'object')
+          , 'expected #{this} to be false'
+          , 'expected #{this} to be true'
+          , this.negate ? true : false
+        );
+      });
+
+      /**
+       * ### .null
+       *
+       * Asserts that the target is `null`.
+       *
+       *     expect(null).to.be.null;
+       *     expect(undefined).not.to.be.null;
+       *
+       * @name null
+       * @api public
+       */
+
+      Assertion.addProperty('null', function () {
+        this.assert(
+            null === flag(this, 'object')
+          , 'expected #{this} to be null'
+          , 'expected #{this} not to be null'
+        );
+      });
+
+      /**
+       * ### .undefined
+       *
+       * Asserts that the target is `undefined`.
+       *
+       *      expect(undefined).to.be.undefined;
+       *      expect(null).to.not.be.undefined;
+       *
+       * @name undefined
+       * @api public
+       */
+
+      Assertion.addProperty('undefined', function () {
+        this.assert(
+            undefined === flag(this, 'object')
+          , 'expected #{this} to be undefined'
+          , 'expected #{this} not to be undefined'
+        );
+      });
+
+      /**
+       * ### .exist
+       *
+       * Asserts that the target is neither `null` nor `undefined`.
+       *
+       *     var foo = 'hi'
+       *       , bar = null
+       *       , baz;
+       *
+       *     expect(foo).to.exist;
+       *     expect(bar).to.not.exist;
+       *     expect(baz).to.not.exist;
+       *
+       * @name exist
+       * @api public
+       */
+
+      Assertion.addProperty('exist', function () {
+        this.assert(
+            null != flag(this, 'object')
+          , 'expected #{this} to exist'
+          , 'expected #{this} to not exist'
+        );
+      });
+
+
+      /**
+       * ### .empty
+       *
+       * Asserts that the target's length is `0`. For arrays, it checks
+       * the `length` property. For objects, it gets the count of
+       * enumerable keys.
+       *
+       *     expect([]).to.be.empty;
+       *     expect('').to.be.empty;
+       *     expect({}).to.be.empty;
+       *
+       * @name empty
+       * @api public
+       */
+
+      Assertion.addProperty('empty', function () {
+        var obj = flag(this, 'object')
+          , expected = obj;
+
+        if (Array.isArray(obj) || 'string' === typeof object) {
+          expected = obj.length;
+        } else if (typeof obj === 'object') {
+          expected = Object.keys(obj).length;
+        }
+
+        this.assert(
+            !expected
+          , 'expected #{this} to be empty'
+          , 'expected #{this} not to be empty'
+        );
+      });
+
+      /**
+       * ### .arguments
+       *
+       * Asserts that the target is an arguments object.
+       *
+       *     function test () {
+       *       expect(arguments).to.be.arguments;
+       *     }
+       *
+       * @name arguments
+       * @alias Arguments
+       * @api public
+       */
+
+      function checkArguments () {
+        var obj = flag(this, 'object')
+          , type = Object.prototype.toString.call(obj);
+        this.assert(
+            '[object Arguments]' === type
+          , 'expected #{this} to be arguments but got ' + type
+          , 'expected #{this} to not be arguments'
+        );
+      }
+
+      Assertion.addProperty('arguments', checkArguments);
+      Assertion.addProperty('Arguments', checkArguments);
+
+      /**
+       * ### .equal(value)
+       *
+       * Asserts that the target is strictly equal (`===`) to `value`.
+       * Alternately, if the `deep` flag is set, asserts that
+       * the target is deeply equal to `value`.
+       *
+       *     expect('hello').to.equal('hello');
+       *     expect(42).to.equal(42);
+       *     expect(1).to.not.equal(true);
+       *     expect({ foo: 'bar' }).to.not.equal({ foo: 'bar' });
+       *     expect({ foo: 'bar' }).to.deep.equal({ foo: 'bar' });
+       *
+       * @name equal
+       * @alias equals
+       * @alias eq
+       * @alias deep.equal
+       * @param {Mixed} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertEqual (val, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        if (flag(this, 'deep')) {
+          return this.eql(val);
+        } else {
+          this.assert(
+              val === obj
+            , 'expected #{this} to equal #{exp}'
+            , 'expected #{this} to not equal #{exp}'
+            , val
+            , this._obj
+            , true
+          );
+        }
+      }
+
+      Assertion.addMethod('equal', assertEqual);
+      Assertion.addMethod('equals', assertEqual);
+      Assertion.addMethod('eq', assertEqual);
+
+      /**
+       * ### .eql(value)
+       *
+       * Asserts that the target is deeply equal to `value`.
+       *
+       *     expect({ foo: 'bar' }).to.eql({ foo: 'bar' });
+       *     expect([ 1, 2, 3 ]).to.eql([ 1, 2, 3 ]);
+       *
+       * @name eql
+       * @alias eqls
+       * @param {Mixed} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertEql(obj, msg) {
+        if (msg) flag(this, 'message', msg);
+        this.assert(
+            _.eql(obj, flag(this, 'object'))
+          , 'expected #{this} to deeply equal #{exp}'
+          , 'expected #{this} to not deeply equal #{exp}'
+          , obj
+          , this._obj
+          , true
+        );
+      }
+
+      Assertion.addMethod('eql', assertEql);
+      Assertion.addMethod('eqls', assertEql);
+
+      /**
+       * ### .above(value)
+       *
+       * Asserts that the target is greater than `value`.
+       *
+       *     expect(10).to.be.above(5);
+       *
+       * Can also be used in conjunction with `length` to
+       * assert a minimum length. The benefit being a
+       * more informative error message than if the length
+       * was supplied directly.
+       *
+       *     expect('foo').to.have.length.above(2);
+       *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+       *
+       * @name above
+       * @alias gt
+       * @alias greaterThan
+       * @param {Number} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertAbove (n, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        if (flag(this, 'doLength')) {
+          new Assertion(obj, msg).to.have.property('length');
+          var len = obj.length;
+          this.assert(
+              len > n
+            , 'expected #{this} to have a length above #{exp} but got #{act}'
+            , 'expected #{this} to not have a length above #{exp}'
+            , n
+            , len
+          );
+        } else {
+          this.assert(
+              obj > n
+            , 'expected #{this} to be above ' + n
+            , 'expected #{this} to be at most ' + n
+          );
+        }
+      }
+
+      Assertion.addMethod('above', assertAbove);
+      Assertion.addMethod('gt', assertAbove);
+      Assertion.addMethod('greaterThan', assertAbove);
+
+      /**
+       * ### .least(value)
+       *
+       * Asserts that the target is greater than or equal to `value`.
+       *
+       *     expect(10).to.be.at.least(10);
+       *
+       * Can also be used in conjunction with `length` to
+       * assert a minimum length. The benefit being a
+       * more informative error message than if the length
+       * was supplied directly.
+       *
+       *     expect('foo').to.have.length.of.at.least(2);
+       *     expect([ 1, 2, 3 ]).to.have.length.of.at.least(3);
+       *
+       * @name least
+       * @alias gte
+       * @param {Number} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertLeast (n, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        if (flag(this, 'doLength')) {
+          new Assertion(obj, msg).to.have.property('length');
+          var len = obj.length;
+          this.assert(
+              len >= n
+            , 'expected #{this} to have a length at least #{exp} but got #{act}'
+            , 'expected #{this} to have a length below #{exp}'
+            , n
+            , len
+          );
+        } else {
+          this.assert(
+              obj >= n
+            , 'expected #{this} to be at least ' + n
+            , 'expected #{this} to be below ' + n
+          );
+        }
+      }
+
+      Assertion.addMethod('least', assertLeast);
+      Assertion.addMethod('gte', assertLeast);
+
+      /**
+       * ### .below(value)
+       *
+       * Asserts that the target is less than `value`.
+       *
+       *     expect(5).to.be.below(10);
+       *
+       * Can also be used in conjunction with `length` to
+       * assert a maximum length. The benefit being a
+       * more informative error message than if the length
+       * was supplied directly.
+       *
+       *     expect('foo').to.have.length.below(4);
+       *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+       *
+       * @name below
+       * @alias lt
+       * @alias lessThan
+       * @param {Number} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertBelow (n, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        if (flag(this, 'doLength')) {
+          new Assertion(obj, msg).to.have.property('length');
+          var len = obj.length;
+          this.assert(
+              len < n
+            , 'expected #{this} to have a length below #{exp} but got #{act}'
+            , 'expected #{this} to not have a length below #{exp}'
+            , n
+            , len
+          );
+        } else {
+          this.assert(
+              obj < n
+            , 'expected #{this} to be below ' + n
+            , 'expected #{this} to be at least ' + n
+          );
+        }
+      }
+
+      Assertion.addMethod('below', assertBelow);
+      Assertion.addMethod('lt', assertBelow);
+      Assertion.addMethod('lessThan', assertBelow);
+
+      /**
+       * ### .most(value)
+       *
+       * Asserts that the target is less than or equal to `value`.
+       *
+       *     expect(5).to.be.at.most(5);
+       *
+       * Can also be used in conjunction with `length` to
+       * assert a maximum length. The benefit being a
+       * more informative error message than if the length
+       * was supplied directly.
+       *
+       *     expect('foo').to.have.length.of.at.most(4);
+       *     expect([ 1, 2, 3 ]).to.have.length.of.at.most(3);
+       *
+       * @name most
+       * @alias lte
+       * @param {Number} value
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertMost (n, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        if (flag(this, 'doLength')) {
+          new Assertion(obj, msg).to.have.property('length');
+          var len = obj.length;
+          this.assert(
+              len <= n
+            , 'expected #{this} to have a length at most #{exp} but got #{act}'
+            , 'expected #{this} to have a length above #{exp}'
+            , n
+            , len
+          );
+        } else {
+          this.assert(
+              obj <= n
+            , 'expected #{this} to be at most ' + n
+            , 'expected #{this} to be above ' + n
+          );
+        }
+      }
+
+      Assertion.addMethod('most', assertMost);
+      Assertion.addMethod('lte', assertMost);
+
+      /**
+       * ### .within(start, finish)
+       *
+       * Asserts that the target is within a range.
+       *
+       *     expect(7).to.be.within(5,10);
+       *
+       * Can also be used in conjunction with `length` to
+       * assert a length range. The benefit being a
+       * more informative error message than if the length
+       * was supplied directly.
+       *
+       *     expect('foo').to.have.length.within(2,4);
+       *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+       *
+       * @name within
+       * @param {Number} start lowerbound inclusive
+       * @param {Number} finish upperbound inclusive
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('within', function (start, finish, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object')
+          , range = start + '..' + finish;
+        if (flag(this, 'doLength')) {
+          new Assertion(obj, msg).to.have.property('length');
+          var len = obj.length;
+          this.assert(
+              len >= start && len <= finish
+            , 'expected #{this} to have a length within ' + range
+            , 'expected #{this} to not have a length within ' + range
+          );
+        } else {
+          this.assert(
+              obj >= start && obj <= finish
+            , 'expected #{this} to be within ' + range
+            , 'expected #{this} to not be within ' + range
+          );
+        }
+      });
+
+      /**
+       * ### .instanceof(constructor)
+       *
+       * Asserts that the target is an instance of `constructor`.
+       *
+       *     var Tea = function (name) { this.name = name; }
+       *       , Chai = new Tea('chai');
+       *
+       *     expect(Chai).to.be.an.instanceof(Tea);
+       *     expect([ 1, 2, 3 ]).to.be.instanceof(Array);
+       *
+       * @name instanceof
+       * @param {Constructor} constructor
+       * @param {String} message _optional_
+       * @alias instanceOf
+       * @api public
+       */
+
+      function assertInstanceOf (constructor, msg) {
+        if (msg) flag(this, 'message', msg);
+        var name = _.getName(constructor);
+        this.assert(
+            flag(this, 'object') instanceof constructor
+          , 'expected #{this} to be an instance of ' + name
+          , 'expected #{this} to not be an instance of ' + name
+        );
+      };
+
+      Assertion.addMethod('instanceof', assertInstanceOf);
+      Assertion.addMethod('instanceOf', assertInstanceOf);
+
+      /**
+       * ### .property(name, [value])
+       *
+       * Asserts that the target has a property `name`, optionally asserting that
+       * the value of that property is strictly equal to  `value`.
+       * If the `deep` flag is set, you can use dot- and bracket-notation for deep
+       * references into objects and arrays.
+       *
+       *     // simple referencing
+       *     var obj = { foo: 'bar' };
+       *     expect(obj).to.have.property('foo');
+       *     expect(obj).to.have.property('foo', 'bar');
+       *
+       *     // deep referencing
+       *     var deepObj = {
+       *         green: { tea: 'matcha' }
+       *       , teas: [ 'chai', 'matcha', { tea: 'konacha' } ]
+       *     };
+
+       *     expect(deepObj).to.have.deep.property('green.tea', 'matcha');
+       *     expect(deepObj).to.have.deep.property('teas[1]', 'matcha');
+       *     expect(deepObj).to.have.deep.property('teas[2].tea', 'konacha');
+       *
+       * You can also use an array as the starting point of a `deep.property`
+       * assertion, or traverse nested arrays.
+       *
+       *     var arr = [
+       *         [ 'chai', 'matcha', 'konacha' ]
+       *       , [ { tea: 'chai' }
+       *         , { tea: 'matcha' }
+       *         , { tea: 'konacha' } ]
+       *     ];
+       *
+       *     expect(arr).to.have.deep.property('[0][1]', 'matcha');
+       *     expect(arr).to.have.deep.property('[1][2].tea', 'konacha');
+       *
+       * Furthermore, `property` changes the subject of the assertion
+       * to be the value of that property from the original object. This
+       * permits for further chainable assertions on that property.
+       *
+       *     expect(obj).to.have.property('foo')
+       *       .that.is.a('string');
+       *     expect(deepObj).to.have.property('green')
+       *       .that.is.an('object')
+       *       .that.deep.equals({ tea: 'matcha' });
+       *     expect(deepObj).to.have.property('teas')
+       *       .that.is.an('array')
+       *       .with.deep.property('[2]')
+       *         .that.deep.equals({ tea: 'konacha' });
+       *
+       * @name property
+       * @alias deep.property
+       * @param {String} name
+       * @param {Mixed} value (optional)
+       * @param {String} message _optional_
+       * @returns value of property for chaining
+       * @api public
+       */
+
+      Assertion.addMethod('property', function (name, val, msg) {
+        if (msg) flag(this, 'message', msg);
+
+        var descriptor = flag(this, 'deep') ? 'deep property ' : 'property '
+          , negate = flag(this, 'negate')
+          , obj = flag(this, 'object')
+          , value = flag(this, 'deep')
+            ? _.getPathValue(name, obj)
+            : obj[name];
+
+        if (negate && undefined !== val) {
+          if (undefined === value) {
+            msg = (msg != null) ? msg + ': ' : '';
+            throw new Error(msg + _.inspect(obj) + ' has no ' + descriptor + _.inspect(name));
+          }
+        } else {
+          this.assert(
+              undefined !== value
+            , 'expected #{this} to have a ' + descriptor + _.inspect(name)
+            , 'expected #{this} to not have ' + descriptor + _.inspect(name));
+        }
+
+        if (undefined !== val) {
+          this.assert(
+              val === value
+            , 'expected #{this} to have a ' + descriptor + _.inspect(name) + ' of #{exp}, but got #{act}'
+            , 'expected #{this} to not have a ' + descriptor + _.inspect(name) + ' of #{act}'
+            , val
+            , value
+          );
+        }
+
+        flag(this, 'object', value);
+      });
+
+
+      /**
+       * ### .ownProperty(name)
+       *
+       * Asserts that the target has an own property `name`.
+       *
+       *     expect('test').to.have.ownProperty('length');
+       *
+       * @name ownProperty
+       * @alias haveOwnProperty
+       * @param {String} name
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertOwnProperty (name, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        this.assert(
+            obj.hasOwnProperty(name)
+          , 'expected #{this} to have own property ' + _.inspect(name)
+          , 'expected #{this} to not have own property ' + _.inspect(name)
+        );
+      }
+
+      Assertion.addMethod('ownProperty', assertOwnProperty);
+      Assertion.addMethod('haveOwnProperty', assertOwnProperty);
+
+      /**
+       * ### .length(value)
+       *
+       * Asserts that the target's `length` property has
+       * the expected value.
+       *
+       *     expect([ 1, 2, 3]).to.have.length(3);
+       *     expect('foobar').to.have.length(6);
+       *
+       * Can also be used as a chain precursor to a value
+       * comparison for the length property.
+       *
+       *     expect('foo').to.have.length.above(2);
+       *     expect([ 1, 2, 3 ]).to.have.length.above(2);
+       *     expect('foo').to.have.length.below(4);
+       *     expect([ 1, 2, 3 ]).to.have.length.below(4);
+       *     expect('foo').to.have.length.within(2,4);
+       *     expect([ 1, 2, 3 ]).to.have.length.within(2,4);
+       *
+       * @name length
+       * @alias lengthOf
+       * @param {Number} length
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      function assertLengthChain () {
+        flag(this, 'doLength', true);
+      }
+
+      function assertLength (n, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        new Assertion(obj, msg).to.have.property('length');
+        var len = obj.length;
+
+        this.assert(
+            len == n
+          , 'expected #{this} to have a length of #{exp} but got #{act}'
+          , 'expected #{this} to not have a length of #{act}'
+          , n
+          , len
+        );
+      }
+
+      Assertion.addChainableMethod('length', assertLength, assertLengthChain);
+      Assertion.addMethod('lengthOf', assertLength, assertLengthChain);
+
+      /**
+       * ### .match(regexp)
+       *
+       * Asserts that the target matches a regular expression.
+       *
+       *     expect('foobar').to.match(/^foo/);
+       *
+       * @name match
+       * @param {RegExp} RegularExpression
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('match', function (re, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        this.assert(
+            re.exec(obj)
+          , 'expected #{this} to match ' + re
+          , 'expected #{this} not to match ' + re
+        );
+      });
+
+      /**
+       * ### .string(string)
+       *
+       * Asserts that the string target contains another string.
+       *
+       *     expect('foobar').to.have.string('bar');
+       *
+       * @name string
+       * @param {String} string
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('string', function (str, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        new Assertion(obj, msg).is.a('string');
+
+        this.assert(
+            ~obj.indexOf(str)
+          , 'expected #{this} to contain ' + _.inspect(str)
+          , 'expected #{this} to not contain ' + _.inspect(str)
+        );
+      });
+
+
+      /**
+       * ### .keys(key1, [key2], [...])
+       *
+       * Asserts that the target has exactly the given keys, or
+       * asserts the inclusion of some keys when using the
+       * `include` or `contain` modifiers.
+       *
+       *     expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
+       *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
+       *
+       * @name keys
+       * @alias key
+       * @param {String...|Array} keys
+       * @api public
+       */
+
+      function assertKeys (keys) {
+        var obj = flag(this, 'object')
+          , str
+          , ok = true;
+
+        keys = keys instanceof Array
+          ? keys
+          : Array.prototype.slice.call(arguments);
+
+        if (!keys.length) throw new Error('keys required');
+
+        var actual = Object.keys(obj)
+          , len = keys.length;
+
+        // Inclusion
+        ok = keys.every(function(key){
+          return ~actual.indexOf(key);
+        });
+
+        // Strict
+        if (!flag(this, 'negate') && !flag(this, 'contains')) {
+          ok = ok && keys.length == actual.length;
+        }
+
+        // Key string
+        if (len > 1) {
+          keys = keys.map(function(key){
+            return _.inspect(key);
+          });
+          var last = keys.pop();
+          str = keys.join(', ') + ', and ' + last;
+        } else {
+          str = _.inspect(keys[0]);
+        }
+
+        // Form
+        str = (len > 1 ? 'keys ' : 'key ') + str;
+
+        // Have / include
+        str = (flag(this, 'contains') ? 'contain ' : 'have ') + str;
+
+        // Assertion
+        this.assert(
+            ok
+          , 'expected #{this} to ' + str
+          , 'expected #{this} to not ' + str
+        );
+      }
+
+      Assertion.addMethod('keys', assertKeys);
+      Assertion.addMethod('key', assertKeys);
+
+      /**
+       * ### .throw(constructor)
+       *
+       * Asserts that the function target will throw a specific error, or specific type of error
+       * (as determined using `instanceof`), optionally with a RegExp or string inclusion test
+       * for the error's message.
+       *
+       *     var err = new ReferenceError('This is a bad function.');
+       *     var fn = function () { throw err; }
+       *     expect(fn).to.throw(ReferenceError);
+       *     expect(fn).to.throw(Error);
+       *     expect(fn).to.throw(/bad function/);
+       *     expect(fn).to.not.throw('good function');
+       *     expect(fn).to.throw(ReferenceError, /bad function/);
+       *     expect(fn).to.throw(err);
+       *     expect(fn).to.not.throw(new RangeError('Out of range.'));
+       *
+       * Please note that when a throw expectation is negated, it will check each
+       * parameter independently, starting with error constructor type. The appropriate way
+       * to check for the existence of a type of error but for a message that does not match
+       * is to use `and`.
+       *
+       *     expect(fn).to.throw(ReferenceError)
+       *        .and.not.throw(/good function/);
+       *
+       * @name throw
+       * @alias throws
+       * @alias Throw
+       * @param {ErrorConstructor} constructor
+       * @param {String|RegExp} expected error message
+       * @param {String} message _optional_
+       * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+       * @api public
+       */
+
+      function assertThrows (constructor, errMsg, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        new Assertion(obj, msg).is.a('function');
+
+        var thrown = false
+          , desiredError = null
+          , name = null
+          , thrownError = null;
+
+        if (arguments.length === 0) {
+          errMsg = null;
+          constructor = null;
+        } else if (constructor && (constructor instanceof RegExp || 'string' === typeof constructor)) {
+          errMsg = constructor;
+          constructor = null;
+        } else if (constructor && constructor instanceof Error) {
+          desiredError = constructor;
+          constructor = null;
+          errMsg = null;
+        } else if (typeof constructor === 'function') {
+          name = (new constructor()).name;
+        } else {
+          constructor = null;
+        }
+
+        try {
+          obj();
+        } catch (err) {
+          // first, check desired error
+          if (desiredError) {
+            this.assert(
+                err === desiredError
+              , 'expected #{this} to throw #{exp} but #{act} was thrown'
+              , 'expected #{this} to not throw #{exp}'
+              , desiredError
+              , err
+            );
+
+            return this;
+          }
+          // next, check constructor
+          if (constructor) {
+            this.assert(
+                err instanceof constructor
+              , 'expected #{this} to throw #{exp} but #{act} was thrown'
+              , 'expected #{this} to not throw #{exp} but #{act} was thrown'
+              , name
+              , err
+            );
+
+            if (!errMsg) return this;
+          }
+          // next, check message
+          var message = 'object' === _.type(err) && "message" in err
+            ? err.message
+            : '' + err;
+
+          if ((message != null) && errMsg && errMsg instanceof RegExp) {
+            this.assert(
+                errMsg.exec(message)
+              , 'expected #{this} to throw error matching #{exp} but got #{act}'
+              , 'expected #{this} to throw error not matching #{exp}'
+              , errMsg
+              , message
+            );
+
+            return this;
+          } else if ((message != null) && errMsg && 'string' === typeof errMsg) {
+            this.assert(
+                ~message.indexOf(errMsg)
+              , 'expected #{this} to throw error including #{exp} but got #{act}'
+              , 'expected #{this} to throw error not including #{act}'
+              , errMsg
+              , message
+            );
+
+            return this;
+          } else {
+            thrown = true;
+            thrownError = err;
+          }
+        }
+
+        var actuallyGot = ''
+          , expectedThrown = name !== null
+            ? name
+            : desiredError
+              ? '#{exp}' //_.inspect(desiredError)
+              : 'an error';
+
+        if (thrown) {
+          actuallyGot = ' but #{act} was thrown'
+        }
+
+        this.assert(
+            thrown === true
+          , 'expected #{this} to throw ' + expectedThrown + actuallyGot
+          , 'expected #{this} to not throw ' + expectedThrown + actuallyGot
+          , desiredError
+          , thrownError
+        );
+      };
+
+      Assertion.addMethod('throw', assertThrows);
+      Assertion.addMethod('throws', assertThrows);
+      Assertion.addMethod('Throw', assertThrows);
+
+      /**
+       * ### .respondTo(method)
+       *
+       * Asserts that the object or class target will respond to a method.
+       *
+       *     Klass.prototype.bar = function(){};
+       *     expect(Klass).to.respondTo('bar');
+       *     expect(obj).to.respondTo('bar');
+       *
+       * To check if a constructor will respond to a static function,
+       * set the `itself` flag.
+       *
+       *    Klass.baz = function(){};
+       *    expect(Klass).itself.to.respondTo('baz');
+       *
+       * @name respondTo
+       * @param {String} method
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('respondTo', function (method, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object')
+          , itself = flag(this, 'itself')
+          , context = ('function' === _.type(obj) && !itself)
+            ? obj.prototype[method]
+            : obj[method];
+
+        this.assert(
+            'function' === typeof context
+          , 'expected #{this} to respond to ' + _.inspect(method)
+          , 'expected #{this} to not respond to ' + _.inspect(method)
+        );
+      });
+
+      /**
+       * ### .itself
+       *
+       * Sets the `itself` flag, later used by the `respondTo` assertion.
+       *
+       *    function Foo() {}
+       *    Foo.bar = function() {}
+       *    Foo.prototype.baz = function() {}
+       *
+       *    expect(Foo).itself.to.respondTo('bar');
+       *    expect(Foo).itself.not.to.respondTo('baz');
+       *
+       * @name itself
+       * @api public
+       */
+
+      Assertion.addProperty('itself', function () {
+        flag(this, 'itself', true);
+      });
+
+      /**
+       * ### .satisfy(method)
+       *
+       * Asserts that the target passes a given truth test.
+       *
+       *     expect(1).to.satisfy(function(num) { return num > 0; });
+       *
+       * @name satisfy
+       * @param {Function} matcher
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('satisfy', function (matcher, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        this.assert(
+            matcher(obj)
+          , 'expected #{this} to satisfy ' + _.objDisplay(matcher)
+          , 'expected #{this} to not satisfy' + _.objDisplay(matcher)
+          , this.negate ? false : true
+          , matcher(obj)
+        );
+      });
+
+      /**
+       * ### .closeTo(expected, delta)
+       *
+       * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+       *
+       *     expect(1.5).to.be.closeTo(1, 0.5);
+       *
+       * @name closeTo
+       * @param {Number} expected
+       * @param {Number} delta
+       * @param {String} message _optional_
+       * @api public
+       */
+
+      Assertion.addMethod('closeTo', function (expected, delta, msg) {
+        if (msg) flag(this, 'message', msg);
+        var obj = flag(this, 'object');
+        this.assert(
+            Math.abs(obj - expected) <= delta
+          , 'expected #{this} to be close to ' + expected + ' +/- ' + delta
+          , 'expected #{this} not to be close to ' + expected + ' +/- ' + delta
+        );
+      });
+
+    };
+
+  }); // module: chai/core/assertions.js
+
+  require.register("chai/error.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Main export
+     */
+
+    module.exports = AssertionError;
+
+    /**
+     * # AssertionError (constructor)
+     *
+     * Create a new assertion error based on the Javascript
+     * `Error` prototype.
+     *
+     * **Options**
+     * - message
+     * - actual
+     * - expected
+     * - operator
+     * - startStackFunction
+     *
+     * @param {Object} options
+     * @api public
+     */
+
+    function AssertionError (options) {
+      options = options || {};
+      this.message = options.message;
+      this.actual = options.actual;
+      this.expected = options.expected;
+      this.operator = options.operator;
+      this.showDiff = options.showDiff;
+
+      if (options.stackStartFunction && Error.captureStackTrace) {
+        var stackStartFunction = options.stackStartFunction;
+        Error.captureStackTrace(this, stackStartFunction);
+      }
+    }
+
+    /*!
+     * Inherit from Error
+     */
+
+    AssertionError.prototype = Object.create(Error.prototype);
+    AssertionError.prototype.name = 'AssertionError';
+    AssertionError.prototype.constructor = AssertionError;
+
+    /**
+     * # toString()
+     *
+     * Override default to string method
+     */
+
+    AssertionError.prototype.toString = function() {
+      return this.message;
+    };
+
+  }); // module: chai/error.js
+
+  require.register("chai/interface/assert.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+
+    module.exports = function (chai, util) {
+
+      /*!
+       * Chai dependencies.
+       */
+
+      var Assertion = chai.Assertion
+        , flag = util.flag;
+
+      /*!
+       * Module export.
+       */
+
+      /**
+       * ### assert(expression, message)
+       *
+       * Write your own test expressions.
+       *
+       *     assert('foo' !== 'bar', 'foo is not bar');
+       *     assert(Array.isArray([]), 'empty arrays are arrays');
+       *
+       * @param {Mixed} expression to test for truthiness
+       * @param {String} message to display on error
+       * @name assert
+       * @api public
+       */
+
+      var assert = chai.assert = function (express, errmsg) {
+        var test = new Assertion(null);
+        test.assert(
+            express
+          , errmsg
+          , '[ negation message unavailable ]'
+        );
+      };
+
+      /**
+       * ### .fail(actual, expected, [message], [operator])
+       *
+       * Throw a failure. Node.js `assert` module-compatible.
+       *
+       * @name fail
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @param {String} operator
+       * @api public
+       */
+
+      assert.fail = function (actual, expected, message, operator) {
+        throw new chai.AssertionError({
+            actual: actual
+          , expected: expected
+          , message: message
+          , operator: operator
+          , stackStartFunction: assert.fail
+        });
+      };
+
+      /**
+       * ### .ok(object, [message])
+       *
+       * Asserts that `object` is truthy.
+       *
+       *     assert.ok('everything', 'everything is ok');
+       *     assert.ok(false, 'this will fail');
+       *
+       * @name ok
+       * @param {Mixed} object to test
+       * @param {String} message
+       * @api public
+       */
+
+      assert.ok = function (val, msg) {
+        new Assertion(val, msg).is.ok;
+      };
+
+      /**
+       * ### .equal(actual, expected, [message])
+       *
+       * Asserts non-strict equality (`==`) of `actual` and `expected`.
+       *
+       *     assert.equal(3, '3', '== coerces values to strings');
+       *
+       * @name equal
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.equal = function (act, exp, msg) {
+        var test = new Assertion(act, msg);
+
+        test.assert(
+            exp == flag(test, 'object')
+          , 'expected #{this} to equal #{exp}'
+          , 'expected #{this} to not equal #{act}'
+          , exp
+          , act
+        );
+      };
+
+      /**
+       * ### .notEqual(actual, expected, [message])
+       *
+       * Asserts non-strict inequality (`!=`) of `actual` and `expected`.
+       *
+       *     assert.notEqual(3, 4, 'these numbers are not equal');
+       *
+       * @name notEqual
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notEqual = function (act, exp, msg) {
+        var test = new Assertion(act, msg);
+
+        test.assert(
+            exp != flag(test, 'object')
+          , 'expected #{this} to not equal #{exp}'
+          , 'expected #{this} to equal #{act}'
+          , exp
+          , act
+        );
+      };
+
+      /**
+       * ### .strictEqual(actual, expected, [message])
+       *
+       * Asserts strict equality (`===`) of `actual` and `expected`.
+       *
+       *     assert.strictEqual(true, true, 'these booleans are strictly equal');
+       *
+       * @name strictEqual
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.strictEqual = function (act, exp, msg) {
+        new Assertion(act, msg).to.equal(exp);
+      };
+
+      /**
+       * ### .notStrictEqual(actual, expected, [message])
+       *
+       * Asserts strict inequality (`!==`) of `actual` and `expected`.
+       *
+       *     assert.notStrictEqual(3, '3', 'no coercion for strict equality');
+       *
+       * @name notStrictEqual
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notStrictEqual = function (act, exp, msg) {
+        new Assertion(act, msg).to.not.equal(exp);
+      };
+
+      /**
+       * ### .deepEqual(actual, expected, [message])
+       *
+       * Asserts that `actual` is deeply equal to `expected`.
+       *
+       *     assert.deepEqual({ tea: 'green' }, { tea: 'green' });
+       *
+       * @name deepEqual
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.deepEqual = function (act, exp, msg) {
+        new Assertion(act, msg).to.eql(exp);
+      };
+
+      /**
+       * ### .notDeepEqual(actual, expected, [message])
+       *
+       * Assert that `actual` is not deeply equal to `expected`.
+       *
+       *     assert.notDeepEqual({ tea: 'green' }, { tea: 'jasmine' });
+       *
+       * @name notDeepEqual
+       * @param {Mixed} actual
+       * @param {Mixed} expected
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notDeepEqual = function (act, exp, msg) {
+        new Assertion(act, msg).to.not.eql(exp);
+      };
+
+      /**
+       * ### .isTrue(value, [message])
+       *
+       * Asserts that `value` is true.
+       *
+       *     var teaServed = true;
+       *     assert.isTrue(teaServed, 'the tea has been served');
+       *
+       * @name isTrue
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isTrue = function (val, msg) {
+        new Assertion(val, msg).is['true'];
+      };
+
+      /**
+       * ### .isFalse(value, [message])
+       *
+       * Asserts that `value` is false.
+       *
+       *     var teaServed = false;
+       *     assert.isFalse(teaServed, 'no tea yet? hmm...');
+       *
+       * @name isFalse
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isFalse = function (val, msg) {
+        new Assertion(val, msg).is['false'];
+      };
+
+      /**
+       * ### .isNull(value, [message])
+       *
+       * Asserts that `value` is null.
+       *
+       *     assert.isNull(err, 'there was no error');
+       *
+       * @name isNull
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNull = function (val, msg) {
+        new Assertion(val, msg).to.equal(null);
+      };
+
+      /**
+       * ### .isNotNull(value, [message])
+       *
+       * Asserts that `value` is not null.
+       *
+       *     var tea = 'tasty chai';
+       *     assert.isNotNull(tea, 'great, time for tea!');
+       *
+       * @name isNotNull
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotNull = function (val, msg) {
+        new Assertion(val, msg).to.not.equal(null);
+      };
+
+      /**
+       * ### .isUndefined(value, [message])
+       *
+       * Asserts that `value` is `undefined`.
+       *
+       *     var tea;
+       *     assert.isUndefined(tea, 'no tea defined');
+       *
+       * @name isUndefined
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isUndefined = function (val, msg) {
+        new Assertion(val, msg).to.equal(undefined);
+      };
+
+      /**
+       * ### .isDefined(value, [message])
+       *
+       * Asserts that `value` is not `undefined`.
+       *
+       *     var tea = 'cup of chai';
+       *     assert.isDefined(tea, 'tea has been defined');
+       *
+       * @name isUndefined
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isDefined = function (val, msg) {
+        new Assertion(val, msg).to.not.equal(undefined);
+      };
+
+      /**
+       * ### .isFunction(value, [message])
+       *
+       * Asserts that `value` is a function.
+       *
+       *     function serveTea() { return 'cup of tea'; };
+       *     assert.isFunction(serveTea, 'great, we can have tea now');
+       *
+       * @name isFunction
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isFunction = function (val, msg) {
+        new Assertion(val, msg).to.be.a('function');
+      };
+
+      /**
+       * ### .isNotFunction(value, [message])
+       *
+       * Asserts that `value` is _not_ a function.
+       *
+       *     var serveTea = [ 'heat', 'pour', 'sip' ];
+       *     assert.isNotFunction(serveTea, 'great, we have listed the steps');
+       *
+       * @name isNotFunction
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotFunction = function (val, msg) {
+        new Assertion(val, msg).to.not.be.a('function');
+      };
+
+      /**
+       * ### .isObject(value, [message])
+       *
+       * Asserts that `value` is an object (as revealed by
+       * `Object.prototype.toString`).
+       *
+       *     var selection = { name: 'Chai', serve: 'with spices' };
+       *     assert.isObject(selection, 'tea selection is an object');
+       *
+       * @name isObject
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isObject = function (val, msg) {
+        new Assertion(val, msg).to.be.a('object');
+      };
+
+      /**
+       * ### .isNotObject(value, [message])
+       *
+       * Asserts that `value` is _not_ an object.
+       *
+       *     var selection = 'chai'
+       *     assert.isObject(selection, 'tea selection is not an object');
+       *     assert.isObject(null, 'null is not an object');
+       *
+       * @name isNotObject
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotObject = function (val, msg) {
+        new Assertion(val, msg).to.not.be.a('object');
+      };
+
+      /**
+       * ### .isArray(value, [message])
+       *
+       * Asserts that `value` is an array.
+       *
+       *     var menu = [ 'green', 'chai', 'oolong' ];
+       *     assert.isArray(menu, 'what kind of tea do we want?');
+       *
+       * @name isArray
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isArray = function (val, msg) {
+        new Assertion(val, msg).to.be.an('array');
+      };
+
+      /**
+       * ### .isNotArray(value, [message])
+       *
+       * Asserts that `value` is _not_ an array.
+       *
+       *     var menu = 'green|chai|oolong';
+       *     assert.isNotArray(menu, 'what kind of tea do we want?');
+       *
+       * @name isNotArray
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotArray = function (val, msg) {
+        new Assertion(val, msg).to.not.be.an('array');
+      };
+
+      /**
+       * ### .isString(value, [message])
+       *
+       * Asserts that `value` is a string.
+       *
+       *     var teaOrder = 'chai';
+       *     assert.isString(teaOrder, 'order placed');
+       *
+       * @name isString
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isString = function (val, msg) {
+        new Assertion(val, msg).to.be.a('string');
+      };
+
+      /**
+       * ### .isNotString(value, [message])
+       *
+       * Asserts that `value` is _not_ a string.
+       *
+       *     var teaOrder = 4;
+       *     assert.isNotString(teaOrder, 'order placed');
+       *
+       * @name isNotString
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotString = function (val, msg) {
+        new Assertion(val, msg).to.not.be.a('string');
+      };
+
+      /**
+       * ### .isNumber(value, [message])
+       *
+       * Asserts that `value` is a number.
+       *
+       *     var cups = 2;
+       *     assert.isNumber(cups, 'how many cups');
+       *
+       * @name isNumber
+       * @param {Number} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNumber = function (val, msg) {
+        new Assertion(val, msg).to.be.a('number');
+      };
+
+      /**
+       * ### .isNotNumber(value, [message])
+       *
+       * Asserts that `value` is _not_ a number.
+       *
+       *     var cups = '2 cups please';
+       *     assert.isNotNumber(cups, 'how many cups');
+       *
+       * @name isNotNumber
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotNumber = function (val, msg) {
+        new Assertion(val, msg).to.not.be.a('number');
+      };
+
+      /**
+       * ### .isBoolean(value, [message])
+       *
+       * Asserts that `value` is a boolean.
+       *
+       *     var teaReady = true
+       *       , teaServed = false;
+       *
+       *     assert.isBoolean(teaReady, 'is the tea ready');
+       *     assert.isBoolean(teaServed, 'has tea been served');
+       *
+       * @name isBoolean
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isBoolean = function (val, msg) {
+        new Assertion(val, msg).to.be.a('boolean');
+      };
+
+      /**
+       * ### .isNotBoolean(value, [message])
+       *
+       * Asserts that `value` is _not_ a boolean.
+       *
+       *     var teaReady = 'yep'
+       *       , teaServed = 'nope';
+       *
+       *     assert.isNotBoolean(teaReady, 'is the tea ready');
+       *     assert.isNotBoolean(teaServed, 'has tea been served');
+       *
+       * @name isNotBoolean
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.isNotBoolean = function (val, msg) {
+        new Assertion(val, msg).to.not.be.a('boolean');
+      };
+
+      /**
+       * ### .typeOf(value, name, [message])
+       *
+       * Asserts that `value`'s type is `name`, as determined by
+       * `Object.prototype.toString`.
+       *
+       *     assert.typeOf({ tea: 'chai' }, 'object', 'we have an object');
+       *     assert.typeOf(['chai', 'jasmine'], 'array', 'we have an array');
+       *     assert.typeOf('tea', 'string', 'we have a string');
+       *     assert.typeOf(/tea/, 'regexp', 'we have a regular expression');
+       *     assert.typeOf(null, 'null', 'we have a null');
+       *     assert.typeOf(undefined, 'undefined', 'we have an undefined');
+       *
+       * @name typeOf
+       * @param {Mixed} value
+       * @param {String} name
+       * @param {String} message
+       * @api public
+       */
+
+      assert.typeOf = function (val, type, msg) {
+        new Assertion(val, msg).to.be.a(type);
+      };
+
+      /**
+       * ### .notTypeOf(value, name, [message])
+       *
+       * Asserts that `value`'s type is _not_ `name`, as determined by
+       * `Object.prototype.toString`.
+       *
+       *     assert.notTypeOf('tea', 'number', 'strings are not numbers');
+       *
+       * @name notTypeOf
+       * @param {Mixed} value
+       * @param {String} typeof name
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notTypeOf = function (val, type, msg) {
+        new Assertion(val, msg).to.not.be.a(type);
+      };
+
+      /**
+       * ### .instanceOf(object, constructor, [message])
+       *
+       * Asserts that `value` is an instance of `constructor`.
+       *
+       *     var Tea = function (name) { this.name = name; }
+       *       , chai = new Tea('chai');
+       *
+       *     assert.instanceOf(chai, Tea, 'chai is an instance of tea');
+       *
+       * @name instanceOf
+       * @param {Object} object
+       * @param {Constructor} constructor
+       * @param {String} message
+       * @api public
+       */
+
+      assert.instanceOf = function (val, type, msg) {
+        new Assertion(val, msg).to.be.instanceOf(type);
+      };
+
+      /**
+       * ### .notInstanceOf(object, constructor, [message])
+       *
+       * Asserts `value` is not an instance of `constructor`.
+       *
+       *     var Tea = function (name) { this.name = name; }
+       *       , chai = new String('chai');
+       *
+       *     assert.notInstanceOf(chai, Tea, 'chai is not an instance of tea');
+       *
+       * @name notInstanceOf
+       * @param {Object} object
+       * @param {Constructor} constructor
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notInstanceOf = function (val, type, msg) {
+        new Assertion(val, msg).to.not.be.instanceOf(type);
+      };
+
+      /**
+       * ### .include(haystack, needle, [message])
+       *
+       * Asserts that `haystack` includes `needle`. Works
+       * for strings and arrays.
+       *
+       *     assert.include('foobar', 'bar', 'foobar contains string "bar"');
+       *     assert.include([ 1, 2, 3 ], 3, 'array contains value');
+       *
+       * @name include
+       * @param {Array|String} haystack
+       * @param {Mixed} needle
+       * @param {String} message
+       * @api public
+       */
+
+      assert.include = function (exp, inc, msg) {
+        var obj = new Assertion(exp, msg);
+
+        if (Array.isArray(exp)) {
+          obj.to.include(inc);
+        } else if ('string' === typeof exp) {
+          obj.to.contain.string(inc);
+        }
+      };
+
+      /**
+       * ### .match(value, regexp, [message])
+       *
+       * Asserts that `value` matches the regular expression `regexp`.
+       *
+       *     assert.match('foobar', /^foo/, 'regexp matches');
+       *
+       * @name match
+       * @param {Mixed} value
+       * @param {RegExp} regexp
+       * @param {String} message
+       * @api public
+       */
+
+      assert.match = function (exp, re, msg) {
+        new Assertion(exp, msg).to.match(re);
+      };
+
+      /**
+       * ### .notMatch(value, regexp, [message])
+       *
+       * Asserts that `value` does not match the regular expression `regexp`.
+       *
+       *     assert.notMatch('foobar', /^foo/, 'regexp does not match');
+       *
+       * @name notMatch
+       * @param {Mixed} value
+       * @param {RegExp} regexp
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notMatch = function (exp, re, msg) {
+        new Assertion(exp, msg).to.not.match(re);
+      };
+
+      /**
+       * ### .property(object, property, [message])
+       *
+       * Asserts that `object` has a property named by `property`.
+       *
+       *     assert.property({ tea: { green: 'matcha' }}, 'tea');
+       *
+       * @name property
+       * @param {Object} object
+       * @param {String} property
+       * @param {String} message
+       * @api public
+       */
+
+      assert.property = function (obj, prop, msg) {
+        new Assertion(obj, msg).to.have.property(prop);
+      };
+
+      /**
+       * ### .notProperty(object, property, [message])
+       *
+       * Asserts that `object` does _not_ have a property named by `property`.
+       *
+       *     assert.notProperty({ tea: { green: 'matcha' }}, 'coffee');
+       *
+       * @name notProperty
+       * @param {Object} object
+       * @param {String} property
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notProperty = function (obj, prop, msg) {
+        new Assertion(obj, msg).to.not.have.property(prop);
+      };
+
+      /**
+       * ### .deepProperty(object, property, [message])
+       *
+       * Asserts that `object` has a property named by `property`, which can be a
+       * string using dot- and bracket-notation for deep reference.
+       *
+       *     assert.deepProperty({ tea: { green: 'matcha' }}, 'tea.green');
+       *
+       * @name deepProperty
+       * @param {Object} object
+       * @param {String} property
+       * @param {String} message
+       * @api public
+       */
+
+      assert.deepProperty = function (obj, prop, msg) {
+        new Assertion(obj, msg).to.have.deep.property(prop);
+      };
+
+      /**
+       * ### .notDeepProperty(object, property, [message])
+       *
+       * Asserts that `object` does _not_ have a property named by `property`, which
+       * can be a string using dot- and bracket-notation for deep reference.
+       *
+       *     assert.notDeepProperty({ tea: { green: 'matcha' }}, 'tea.oolong');
+       *
+       * @name notDeepProperty
+       * @param {Object} object
+       * @param {String} property
+       * @param {String} message
+       * @api public
+       */
+
+      assert.notDeepProperty = function (obj, prop, msg) {
+        new Assertion(obj, msg).to.not.have.deep.property(prop);
+      };
+
+      /**
+       * ### .propertyVal(object, property, value, [message])
+       *
+       * Asserts that `object` has a property named by `property` with value given
+       * by `value`.
+       *
+       *     assert.propertyVal({ tea: 'is good' }, 'tea', 'is good');
+       *
+       * @name propertyVal
+       * @param {Object} object
+       * @param {String} property
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.propertyVal = function (obj, prop, val, msg) {
+        new Assertion(obj, msg).to.have.property(prop, val);
+      };
+
+      /**
+       * ### .propertyNotVal(object, property, value, [message])
+       *
+       * Asserts that `object` has a property named by `property`, but with a value
+       * different from that given by `value`.
+       *
+       *     assert.propertyNotVal({ tea: 'is good' }, 'tea', 'is bad');
+       *
+       * @name propertyNotVal
+       * @param {Object} object
+       * @param {String} property
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.propertyNotVal = function (obj, prop, val, msg) {
+        new Assertion(obj, msg).to.not.have.property(prop, val);
+      };
+
+      /**
+       * ### .deepPropertyVal(object, property, value, [message])
+       *
+       * Asserts that `object` has a property named by `property` with value given
+       * by `value`. `property` can use dot- and bracket-notation for deep
+       * reference.
+       *
+       *     assert.deepPropertyVal({ tea: { green: 'matcha' }}, 'tea.green', 'matcha');
+       *
+       * @name deepPropertyVal
+       * @param {Object} object
+       * @param {String} property
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.deepPropertyVal = function (obj, prop, val, msg) {
+        new Assertion(obj, msg).to.have.deep.property(prop, val);
+      };
+
+      /**
+       * ### .deepPropertyNotVal(object, property, value, [message])
+       *
+       * Asserts that `object` has a property named by `property`, but with a value
+       * different from that given by `value`. `property` can use dot- and
+       * bracket-notation for deep reference.
+       *
+       *     assert.deepPropertyNotVal({ tea: { green: 'matcha' }}, 'tea.green', 'konacha');
+       *
+       * @name deepPropertyNotVal
+       * @param {Object} object
+       * @param {String} property
+       * @param {Mixed} value
+       * @param {String} message
+       * @api public
+       */
+
+      assert.deepPropertyNotVal = function (obj, prop, val, msg) {
+        new Assertion(obj, msg).to.not.have.deep.property(prop, val);
+      };
+
+      /**
+       * ### .lengthOf(object, length, [message])
+       *
+       * Asserts that `object` has a `length` property with the expected value.
+       *
+       *     assert.lengthOf([1,2,3], 3, 'array has length of 3');
+       *     assert.lengthOf('foobar', 5, 'string has length of 6');
+       *
+       * @name lengthOf
+       * @param {Mixed} object
+       * @param {Number} length
+       * @param {String} message
+       * @api public
+       */
+
+      assert.lengthOf = function (exp, len, msg) {
+        new Assertion(exp, msg).to.have.length(len);
+      };
+
+      /**
+       * ### .throws(function, [constructor/string/regexp], [string/regexp], [message])
+       *
+       * Asserts that `function` will throw an error that is an instance of
+       * `constructor`, or alternately that it will throw an error with message
+       * matching `regexp`.
+       *
+       *     assert.throw(fn, 'function throws a reference error');
+       *     assert.throw(fn, /function throws a reference error/);
+       *     assert.throw(fn, ReferenceError);
+       *     assert.throw(fn, ReferenceError, 'function throws a reference error');
+       *     assert.throw(fn, ReferenceError, /function throws a reference error/);
+       *
+       * @name throws
+       * @alias throw
+       * @alias Throw
+       * @param {Function} function
+       * @param {ErrorConstructor} constructor
+       * @param {RegExp} regexp
+       * @param {String} message
+       * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+       * @api public
+       */
+
+      assert.Throw = function (fn, errt, errs, msg) {
+        if ('string' === typeof errt || errt instanceof RegExp) {
+          errs = errt;
+          errt = null;
+        }
+
+        new Assertion(fn, msg).to.Throw(errt, errs);
+      };
+
+      /**
+       * ### .doesNotThrow(function, [constructor/regexp], [message])
+       *
+       * Asserts that `function` will _not_ throw an error that is an instance of
+       * `constructor`, or alternately that it will not throw an error with message
+       * matching `regexp`.
+       *
+       *     assert.doesNotThrow(fn, Error, 'function does not throw');
+       *
+       * @name doesNotThrow
+       * @param {Function} function
+       * @param {ErrorConstructor} constructor
+       * @param {RegExp} regexp
+       * @param {String} message
+       * @see https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Error#Error_types
+       * @api public
+       */
+
+      assert.doesNotThrow = function (fn, type, msg) {
+        if ('string' === typeof type) {
+          msg = type;
+          type = null;
+        }
+
+        new Assertion(fn, msg).to.not.Throw(type);
+      };
+
+      /**
+       * ### .operator(val1, operator, val2, [message])
+       *
+       * Compares two values using `operator`.
+       *
+       *     assert.operator(1, '<', 2, 'everything is ok');
+       *     assert.operator(1, '>', 2, 'this will fail');
+       *
+       * @name operator
+       * @param {Mixed} val1
+       * @param {String} operator
+       * @param {Mixed} val2
+       * @param {String} message
+       * @api public
+       */
+
+      assert.operator = function (val, operator, val2, msg) {
+        if (!~['==', '===', '>', '>=', '<', '<=', '!=', '!=='].indexOf(operator)) {
+          throw new Error('Invalid operator "' + operator + '"');
+        }
+        var test = new Assertion(eval(val + operator + val2), msg);
+        test.assert(
+            true === flag(test, 'object')
+          , 'expected ' + util.inspect(val) + ' to be ' + operator + ' ' + util.inspect(val2)
+          , 'expected ' + util.inspect(val) + ' to not be ' + operator + ' ' + util.inspect(val2) );
+      };
+
+      /**
+       * ### .closeTo(actual, expected, delta, [message])
+       *
+       * Asserts that the target is equal `expected`, to within a +/- `delta` range.
+       *
+       *     assert.closeTo(1.5, 1, 0.5, 'numbers are close');
+       *
+       * @name closeTo
+       * @param {Number} actual
+       * @param {Number} expected
+       * @param {Number} delta
+       * @param {String} message
+       * @api public
+       */
+
+      assert.closeTo = function (act, exp, delta, msg) {
+        new Assertion(act, msg).to.be.closeTo(exp, delta);
+      };
+
+      /*!
+       * Undocumented / untested
+       */
+
+      assert.ifError = function (val, msg) {
+        new Assertion(val, msg).to.not.be.ok;
+      };
+
+      /*!
+       * Aliases.
+       */
+
+      (function alias(name, as){
+        assert[as] = assert[name];
+        return alias;
+      })
+      ('Throw', 'throw')
+      ('Throw', 'throws');
+    };
+
+  }); // module: chai/interface/assert.js
+
+  require.register("chai/interface/expect.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    module.exports = function (chai, util) {
+      chai.expect = function (val, message) {
+        return new chai.Assertion(val, message);
+      };
+    };
+
+
+  }); // module: chai/interface/expect.js
+
+  require.register("chai/interface/should.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    module.exports = function (chai, util) {
+      var Assertion = chai.Assertion;
+
+      function loadShould () {
+        // modify Object.prototype to have `should`
+        Object.defineProperty(Object.prototype, 'should',
+          {
+            set: function (value) {
+              // See https://github.com/chaijs/chai/issues/86: this makes
+              // `whatever.should = someValue` actually set `someValue`, which is
+              // especially useful for `global.should = require('chai').should()`.
+              //
+              // Note that we have to use [[DefineProperty]] instead of [[Put]]
+              // since otherwise we would trigger this very setter!
+              Object.defineProperty(this, 'should', {
+                value: value,
+                enumerable: true,
+                configurable: true,
+                writable: true
+              });
+            }
+          , get: function(){
+              if (this instanceof String || this instanceof Number) {
+                return new Assertion(this.constructor(this));
+              } else if (this instanceof Boolean) {
+                return new Assertion(this == true);
+              }
+              return new Assertion(this);
+            }
+          , configurable: true
+        });
+
+        var should = {};
+
+        should.equal = function (val1, val2, msg) {
+          new Assertion(val1, msg).to.equal(val2);
+        };
+
+        should.Throw = function (fn, errt, errs, msg) {
+          new Assertion(fn, msg).to.Throw(errt, errs);
+        };
+
+        should.exist = function (val, msg) {
+          new Assertion(val, msg).to.exist;
+        }
+
+        // negation
+        should.not = {}
+
+        should.not.equal = function (val1, val2, msg) {
+          new Assertion(val1, msg).to.not.equal(val2);
+        };
+
+        should.not.Throw = function (fn, errt, errs, msg) {
+          new Assertion(fn, msg).to.not.Throw(errt, errs);
+        };
+
+        should.not.exist = function (val, msg) {
+          new Assertion(val, msg).to.not.exist;
+        }
+
+        should['throw'] = should['Throw'];
+        should.not['throw'] = should.not['Throw'];
+
+        return should;
+      };
+
+      chai.should = loadShould;
+      chai.Should = loadShould;
+    };
+
+  }); // module: chai/interface/should.js
+
+  require.register("chai/utils/addChainableMethod.js", function(module, exports, require){
+    /*!
+     * Chai - addChainingMethod utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Module dependencies
+     */
+
+    var transferFlags = require('./transferFlags');
+
+    /*!
+     * Module variables
+     */
+
+    // Check whether `__proto__` is supported
+    var hasProtoSupport = '__proto__' in Object;
+
+    // Without `__proto__` support, this module will need to add properties to a function.
+    // However, some Function.prototype methods cannot be overwritten,
+    // and there seems no easy cross-platform way to detect them (@see chaijs/chai/issues/69).
+    var excludeNames = /^(?:length|name|arguments|caller)$/;
+
+    /**
+     * ### addChainableMethod (ctx, name, method, chainingBehavior)
+     *
+     * Adds a method to an object, such that the method can also be chained.
+     *
+     *     utils.addChainableMethod(chai.Assertion.prototype, 'foo', function (str) {
+     *       var obj = utils.flag(this, 'object');
+     *       new chai.Assertion(obj).to.be.equal(str);
+     *     });
+     *
+     * Can also be accessed directly from `chai.Assertion`.
+     *
+     *     chai.Assertion.addChainableMethod('foo', fn, chainingBehavior);
+     *
+     * The result can then be used as both a method assertion, executing both `method` and
+     * `chainingBehavior`, or as a language chain, which only executes `chainingBehavior`.
+     *
+     *     expect(fooStr).to.be.foo('bar');
+     *     expect(fooStr).to.be.foo.equal('foo');
+     *
+     * @param {Object} ctx object to which the method is added
+     * @param {String} name of method to add
+     * @param {Function} method function to be used for `name`, when called
+     * @param {Function} chainingBehavior function to be called every time the property is accessed
+     * @name addChainableMethod
+     * @api public
+     */
+
+    module.exports = function (ctx, name, method, chainingBehavior) {
+      if (typeof chainingBehavior !== 'function')
+        chainingBehavior = function () { };
+
+      Object.defineProperty(ctx, name,
+        { get: function () {
+            chainingBehavior.call(this);
+
+            var assert = function () {
+              var result = method.apply(this, arguments);
+              return result === undefined ? this : result;
+            };
+
+            // Use `__proto__` if available
+            if (hasProtoSupport) {
+              assert.__proto__ = this;
+            }
+            // Otherwise, redefine all properties (slow!)
+            else {
+              var asserterNames = Object.getOwnPropertyNames(ctx);
+              asserterNames.forEach(function (asserterName) {
+                if (!excludeNames.test(asserterName)) {
+                  var pd = Object.getOwnPropertyDescriptor(ctx, asserterName);
+                  Object.defineProperty(assert, asserterName, pd);
+                }
+              });
+            }
+
+            transferFlags(this, assert);
+            return assert;
+          }
+        , configurable: true
+      });
+    };
+
+  }); // module: chai/utils/addChainableMethod.js
+
+  require.register("chai/utils/addMethod.js", function(module, exports, require){
+    /*!
+     * Chai - addMethod utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### .addMethod (ctx, name, method)
+     *
+     * Adds a method to the prototype of an object.
+     *
+     *     utils.addMethod(chai.Assertion.prototype, 'foo', function (str) {
+     *       var obj = utils.flag(this, 'object');
+     *       new chai.Assertion(obj).to.be.equal(str);
+     *     });
+     *
+     * Can also be accessed directly from `chai.Assertion`.
+     *
+     *     chai.Assertion.addMethod('foo', fn);
+     *
+     * Then can be used as any other assertion.
+     *
+     *     expect(fooStr).to.be.foo('bar');
+     *
+     * @param {Object} ctx object to which the method is added
+     * @param {String} name of method to add
+     * @param {Function} method function to be used for name
+     * @name addMethod
+     * @api public
+     */
+
+    module.exports = function (ctx, name, method) {
+      ctx[name] = function () {
+        var result = method.apply(this, arguments);
+        return result === undefined ? this : result;
+      };
+    };
+
+  }); // module: chai/utils/addMethod.js
+
+  require.register("chai/utils/addProperty.js", function(module, exports, require){
+    /*!
+     * Chai - addProperty utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### addProperty (ctx, name, getter)
+     *
+     * Adds a property to the prototype of an object.
+     *
+     *     utils.addProperty(chai.Assertion.prototype, 'foo', function () {
+     *       var obj = utils.flag(this, 'object');
+     *       new chai.Assertion(obj).to.be.instanceof(Foo);
+     *     });
+     *
+     * Can also be accessed directly from `chai.Assertion`.
+     *
+     *     chai.Assertion.addProperty('foo', fn);
+     *
+     * Then can be used as any other assertion.
+     *
+     *     expect(myFoo).to.be.foo;
+     *
+     * @param {Object} ctx object to which the property is added
+     * @param {String} name of property to add
+     * @param {Function} getter function to be used for name
+     * @name addProperty
+     * @api public
+     */
+
+    module.exports = function (ctx, name, getter) {
+      Object.defineProperty(ctx, name,
+        { get: function () {
+            var result = getter.call(this);
+            return result === undefined ? this : result;
+          }
+        , configurable: true
+      });
+    };
+
+  }); // module: chai/utils/addProperty.js
+
+  require.register("chai/utils/eql.js", function(module, exports, require){
+    // This is (almost) directly from Node.js assert
+    // https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/assert.js
+
+    module.exports = _deepEqual;
+
+    var getEnumerableProperties = require('./getEnumerableProperties');
+
+    // for the browser
+    var Buffer;
+    try {
+      Buffer = require('buffer').Buffer;
+    } catch (ex) {
+      Buffer = {
+        isBuffer: function () { return false; }
+      };
+    }
+
+    function _deepEqual(actual, expected, memos) {
+
+      // 7.1. All identical values are equivalent, as determined by ===.
+      if (actual === expected) {
+        return true;
+
+      } else if (Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
+        if (actual.length != expected.length) return false;
+
+        for (var i = 0; i < actual.length; i++) {
+          if (actual[i] !== expected[i]) return false;
+        }
+
+        return true;
+
+      // 7.2. If the expected value is a Date object, the actual value is
+      // equivalent if it is also a Date object that refers to the same time.
+      } else if (actual instanceof Date && expected instanceof Date) {
+        return actual.getTime() === expected.getTime();
+
+      // 7.3. Other pairs that do not both pass typeof value == 'object',
+      // equivalence is determined by ==.
+      } else if (typeof actual != 'object' && typeof expected != 'object') {
+        return actual === expected;
+
+      // 7.4. For all other Object pairs, including Array objects, equivalence is
+      // determined by having the same number of owned properties (as verified
+      // with Object.prototype.hasOwnProperty.call), the same set of keys
+      // (although not necessarily the same order), equivalent values for every
+      // corresponding key, and an identical 'prototype' property. Note: this
+      // accounts for both named and indexed properties on Arrays.
+      } else {
+        return objEquiv(actual, expected, memos);
+      }
+    }
+
+    function isUndefinedOrNull(value) {
+      return value === null || value === undefined;
+    }
+
+    function isArguments(object) {
+      return Object.prototype.toString.call(object) == '[object Arguments]';
+    }
+
+    function objEquiv(a, b, memos) {
+      if (isUndefinedOrNull(a) || isUndefinedOrNull(b))
+        return false;
+
+      // an identical 'prototype' property.
+      if (a.prototype !== b.prototype) return false;
+
+      // check if we have already compared a and b
+      var i;
+      if (memos) {
+        for(i = 0; i < memos.length; i++) {
+          if ((memos[i][0] === a && memos[i][1] === b) ||
+              (memos[i][0] === b && memos[i][1] === a))
+            return true;
+        }
+      } else {
+        memos = [];
+      }
+
+      //~~~I've managed to break Object.keys through screwy arguments passing.
+      //   Converting to array solves the problem.
+      if (isArguments(a)) {
+        if (!isArguments(b)) {
+          return false;
+        }
+        a = pSlice.call(a);
+        b = pSlice.call(b);
+        return _deepEqual(a, b, memos);
+      }
+      try {
+        var ka = getEnumerableProperties(a),
+            kb = getEnumerableProperties(b),
+            key;
+      } catch (e) {//happens when one is a string literal and the other isn't
+        return false;
+      }
+
+      // having the same number of owned properties (keys incorporates
+      // hasOwnProperty)
+      if (ka.length != kb.length)
+        return false;
+
+      //the same set of keys (although not necessarily the same order),
+      ka.sort();
+      kb.sort();
+      //~~~cheap key test
+      for (i = ka.length - 1; i >= 0; i--) {
+        if (ka[i] != kb[i])
+          return false;
+      }
+
+      // remember objects we have compared to guard against circular references
+      memos.push([ a, b ]);
+
+      //equivalent values for every corresponding key, and
+      //~~~possibly expensive deep test
+      for (i = ka.length - 1; i >= 0; i--) {
+        key = ka[i];
+        if (!_deepEqual(a[key], b[key], memos)) return false;
+      }
+
+      return true;
+    }
+
+  }); // module: chai/utils/eql.js
+
+  require.register("chai/utils/flag.js", function(module, exports, require){
+    /*!
+     * Chai - flag utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### flag(object ,key, [value])
+     *
+     * Get or set a flag value on an object. If a
+     * value is provided it will be set, else it will
+     * return the currently set value or `undefined` if
+     * the value is not set.
+     *
+     *     utils.flag(this, 'foo', 'bar'); // setter
+     *     utils.flag(this, 'foo'); // getter, returns `bar`
+     *
+     * @param {Object} object (constructed Assertion
+     * @param {String} key
+     * @param {Mixed} value (optional)
+     * @name flag
+     * @api private
+     */
+
+    module.exports = function (obj, key, value) {
+      var flags = obj.__flags || (obj.__flags = Object.create(null));
+      if (arguments.length === 3) {
+        flags[key] = value;
+      } else {
+        return flags[key];
+      }
+    };
+
+  }); // module: chai/utils/flag.js
+
+  require.register("chai/utils/getActual.js", function(module, exports, require){
+    /*!
+     * Chai - getActual utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * # getActual(object, [actual])
+     *
+     * Returns the `actual` value for an Assertion
+     *
+     * @param {Object} object (constructed Assertion)
+     * @param {Arguments} chai.Assertion.prototype.assert arguments
+     */
+
+    module.exports = function (obj, args) {
+      var actual = args[4];
+      return 'undefined' !== typeof actual ? actual : obj._obj;
+    };
+
+  }); // module: chai/utils/getActual.js
+
+  require.register("chai/utils/getEnumerableProperties.js", function(module, exports, require){
+    /*!
+     * Chai - getEnumerableProperties utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### .getEnumerableProperties(object)
+     *
+     * This allows the retrieval of enumerable property names of an object,
+     * inherited or not.
+     *
+     * @param {Object} object
+     * @returns {Array}
+     * @name getEnumerableProperties
+     * @api public
+     */
+
+    module.exports = function getEnumerableProperties(object) {
+      var result = [];
+      for (var name in object) {
+        result.push(name);
+      }
+      return result;
+    };
+
+  }); // module: chai/utils/getEnumerableProperties.js
+
+  require.register("chai/utils/getMessage.js", function(module, exports, require){
+    /*!
+     * Chai - message composition utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Module dependancies
+     */
+
+    var flag = require('./flag')
+      , getActual = require('./getActual')
+      , inspect = require('./inspect')
+      , objDisplay = require('./objDisplay');
+
+    /**
+     * ### .getMessage(object, message, negateMessage)
+     *
+     * Construct the error message based on flags
+     * and template tags. Template tags will return
+     * a stringified inspection of the object referenced.
+     *
+     * Messsage template tags:
+     * - `#{this}` current asserted object
+     * - `#{act}` actual value
+     * - `#{exp}` expected value
+     *
+     * @param {Object} object (constructed Assertion)
+     * @param {Arguments} chai.Assertion.prototype.assert arguments
+     * @name getMessage
+     * @api public
+     */
+
+    module.exports = function (obj, args) {
+      var negate = flag(obj, 'negate')
+        , val = flag(obj, 'object')
+        , expected = args[3]
+        , actual = getActual(obj, args)
+        , msg = negate ? args[2] : args[1]
+        , flagMsg = flag(obj, 'message');
+
+      msg = msg || '';
+      msg = msg
+        .replace(/#{this}/g, objDisplay(val))
+        .replace(/#{act}/g, objDisplay(actual))
+        .replace(/#{exp}/g, objDisplay(expected));
+
+      return flagMsg ? flagMsg + ': ' + msg : msg;
+    };
+
+  }); // module: chai/utils/getMessage.js
+
+  require.register("chai/utils/getName.js", function(module, exports, require){
+    /*!
+     * Chai - getName utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * # getName(func)
+     *
+     * Gets the name of a function, in a cross-browser way.
+     *
+     * @param {Function} a function (usually a constructor)
+     */
+
+    module.exports = function (func) {
+      if (func.name) return func.name;
+
+      var match = /^\s?function ([^(]*)\(/.exec(func);
+      return match && match[1] ? match[1] : "";
+    };
+
+  }); // module: chai/utils/getName.js
+
+  require.register("chai/utils/getPathValue.js", function(module, exports, require){
+    /*!
+     * Chai - getPathValue utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * @see https://github.com/logicalparadox/filtr
+     * MIT Licensed
+     */
+
+    /**
+     * ### .getPathValue(path, object)
+     *
+     * This allows the retrieval of values in an
+     * object given a string path.
+     *
+     *     var obj = {
+     *         prop1: {
+     *             arr: ['a', 'b', 'c']
+     *           , str: 'Hello'
+     *         }
+     *       , prop2: {
+     *             arr: [ { nested: 'Universe' } ]
+     *           , str: 'Hello again!'
+     *         }
+     *     }
+     *
+     * The following would be the results.
+     *
+     *     getPathValue('prop1.str', obj); // Hello
+     *     getPathValue('prop1.att[2]', obj); // b
+     *     getPathValue('prop2.arr[0].nested', obj); // Universe
+     *
+     * @param {String} path
+     * @param {Object} object
+     * @returns {Object} value or `undefined`
+     * @name getPathValue
+     * @api public
+     */
+
+    var getPathValue = module.exports = function (path, obj) {
+      var parsed = parsePath(path);
+      return _getPathValue(parsed, obj);
+    };
+
+    /*!
+     * ## parsePath(path)
+     *
+     * Helper function used to parse string object
+     * paths. Use in conjunction with `_getPathValue`.
+     *
+     *      var parsed = parsePath('myobject.property.subprop');
+     *
+     * ### Paths:
+     *
+     * * Can be as near infinitely deep and nested
+     * * Arrays are also valid using the formal `myobject.document[3].property`.
+     *
+     * @param {String} path
+     * @returns {Object} parsed
+     * @api private
+     */
+
+    function parsePath (path) {
+      var str = path.replace(/\[/g, '.[')
+        , parts = str.match(/(\\\.|[^.]+?)+/g);
+      return parts.map(function (value) {
+        var re = /\[(\d+)\]$/
+          , mArr = re.exec(value)
+        if (mArr) return { i: parseFloat(mArr[1]) };
+        else return { p: value };
+      });
+    };
+
+    /*!
+     * ## _getPathValue(parsed, obj)
+     *
+     * Helper companion function for `.parsePath` that returns
+     * the value located at the parsed address.
+     *
+     *      var value = getPathValue(parsed, obj);
+     *
+     * @param {Object} parsed definition from `parsePath`.
+     * @param {Object} object to search against
+     * @returns {Object|Undefined} value
+     * @api private
+     */
+
+    function _getPathValue (parsed, obj) {
+      var tmp = obj
+        , res;
+      for (var i = 0, l = parsed.length; i < l; i++) {
+        var part = parsed[i];
+        if (tmp) {
+          if ('undefined' !== typeof part.p)
+            tmp = tmp[part.p];
+          else if ('undefined' !== typeof part.i)
+            tmp = tmp[part.i];
+          if (i == (l - 1)) res = tmp;
+        } else {
+          res = undefined;
+        }
+      }
+      return res;
+    };
+
+  }); // module: chai/utils/getPathValue.js
+
+  require.register("chai/utils/getProperties.js", function(module, exports, require){
+    /*!
+     * Chai - getProperties utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### .getProperties(object)
+     *
+     * This allows the retrieval of property names of an object, enumerable or not,
+     * inherited or not.
+     *
+     * @param {Object} object
+     * @returns {Array}
+     * @name getProperties
+     * @api public
+     */
+
+    module.exports = function getProperties(object) {
+      var result = Object.getOwnPropertyNames(subject);
+
+      function addProperty(property) {
+        if (result.indexOf(property) === -1) {
+          result.push(property);
+        }
+      }
+
+      var proto = Object.getPrototypeOf(subject);
+      while (proto !== null) {
+        Object.getOwnPropertyNames(proto).forEach(addProperty);
+        proto = Object.getPrototypeOf(proto);
+      }
+
+      return result;
+    };
+
+  }); // module: chai/utils/getProperties.js
+
+  require.register("chai/utils/index.js", function(module, exports, require){
+    /*!
+     * chai
+     * Copyright(c) 2011 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Main exports
+     */
+
+    var exports = module.exports = {};
+
+    /*!
+     * test utility
+     */
+
+    exports.test = require('./test');
+
+    /*!
+     * type utility
+     */
+
+    exports.type = require('./type');
+
+    /*!
+     * message utility
+     */
+
+    exports.getMessage = require('./getMessage');
+
+    /*!
+     * actual utility
+     */
+
+    exports.getActual = require('./getActual');
+
+    /*!
+     * Inspect util
+     */
+
+    exports.inspect = require('./inspect');
+
+    /*!
+     * Object Display util
+     */
+
+    exports.objDisplay = require('./objDisplay');
+
+    /*!
+     * Flag utility
+     */
+
+    exports.flag = require('./flag');
+
+    /*!
+     * Flag transferring utility
+     */
+
+    exports.transferFlags = require('./transferFlags');
+
+    /*!
+     * Deep equal utility
+     */
+
+    exports.eql = require('./eql');
+
+    /*!
+     * Deep path value
+     */
+
+    exports.getPathValue = require('./getPathValue');
+
+    /*!
+     * Function name
+     */
+
+    exports.getName = require('./getName');
+
+    /*!
+     * add Property
+     */
+
+    exports.addProperty = require('./addProperty');
+
+    /*!
+     * add Method
+     */
+
+    exports.addMethod = require('./addMethod');
+
+    /*!
+     * overwrite Property
+     */
+
+    exports.overwriteProperty = require('./overwriteProperty');
+
+    /*!
+     * overwrite Method
+     */
+
+    exports.overwriteMethod = require('./overwriteMethod');
+
+    /*!
+     * Add a chainable method
+     */
+
+    exports.addChainableMethod = require('./addChainableMethod');
+
+
+  }); // module: chai/utils/index.js
+
+  require.register("chai/utils/inspect.js", function(module, exports, require){
+    // This is (almost) directly from Node.js utils
+    // https://github.com/joyent/node/blob/f8c335d0caf47f16d31413f89aa28eda3878e3aa/lib/util.js
+
+    var getName = require('./getName');
+    var getProperties = require('./getProperties');
+    var getEnumerableProperties = require('./getEnumerableProperties');
+
+    module.exports = inspect;
+
+    /**
+     * Echos the value of a value. Trys to print the value out
+     * in the best way possible given the different types.
+     *
+     * @param {Object} obj The object to print out.
+     * @param {Boolean} showHidden Flag that shows hidden (not enumerable)
+     *    properties of objects.
+     * @param {Number} depth Depth in which to descend in object. Default is 2.
+     * @param {Boolean} colors Flag to turn on ANSI escape codes to color the
+     *    output. Default is false (no coloring).
+     */
+    function inspect(obj, showHidden, depth, colors) {
+      var ctx = {
+        showHidden: showHidden,
+        seen: [],
+        stylize: function (str) { return str; }
+      };
+      return formatValue(ctx, obj, (typeof depth === 'undefined' ? 2 : depth));
+    }
+
+    // https://gist.github.com/1044128/
+    var getOuterHTML = function(element) {
+      if ('outerHTML' in element) return element.outerHTML;
+      var ns = "http://www.w3.org/1999/xhtml";
+      var container = document.createElementNS(ns, '_');
+      var elemProto = (window.HTMLElement || window.Element).prototype;
+      var xmlSerializer = new XMLSerializer();
+      var html;
+      if (document.xmlVersion) {
+        return xmlSerializer.serializeToString(element);
+      } else {
+        container.appendChild(element.cloneNode(false));
+        html = container.innerHTML.replace('><', '>' + element.innerHTML + '<');
+        container.innerHTML = '';
+        return html;
+      }
+    };
+
+    // Returns true if object is a DOM element.
+    var isDOMElement = function (object) {
+      if (typeof HTMLElement === 'object') {
+        return object instanceof HTMLElement;
+      } else {
+        return object &&
+          typeof object === 'object' &&
+          object.nodeType === 1 &&
+          typeof object.nodeName === 'string';
+      }
+    };
+
+    function formatValue(ctx, value, recurseTimes) {
+      // Provide a hook for user-specified inspect functions.
+      // Check that value is an object with an inspect function on it
+      if (value && typeof value.inspect === 'function' &&
+          // Filter out the util module, it's inspect function is special
+          value.inspect !== exports.inspect &&
+          // Also filter out any prototype objects using the circular check.
+          !(value.constructor && value.constructor.prototype === value)) {
+        return value.inspect(recurseTimes);
+      }
+
+      // Primitive types cannot have properties
+      var primitive = formatPrimitive(ctx, value);
+      if (primitive) {
+        return primitive;
+      }
+
+      // If it's DOM elem, get outer HTML.
+      if (isDOMElement(value)) {
+        return getOuterHTML(value);
+      }
+
+      // Look up the keys of the object.
+      var visibleKeys = getEnumerableProperties(value);
+      var keys = ctx.showHidden ? getProperties(value) : visibleKeys;
+
+      // Some type of object without properties can be shortcutted.
+      // In IE, errors have a single `stack` property, or if they are vanilla `Error`,
+      // a `stack` plus `description` property; ignore those for consistency.
+      if (keys.length === 0 || (isError(value) && (
+          (keys.length === 1 && keys[0] === 'stack') ||
+          (keys.length === 2 && keys[0] === 'description' && keys[1] === 'stack')
+         ))) {
+        if (typeof value === 'function') {
+          var name = getName(value);
+          var nameSuffix = name ? ': ' + name : '';
+          return ctx.stylize('[Function' + nameSuffix + ']', 'special');
+        }
+        if (isRegExp(value)) {
+          return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+        }
+        if (isDate(value)) {
+          return ctx.stylize(Date.prototype.toUTCString.call(value), 'date');
+        }
+        if (isError(value)) {
+          return formatError(value);
+        }
+      }
+
+      var base = '', array = false, braces = ['{', '}'];
+
+      // Make Array say that they are Array
+      if (isArray(value)) {
+        array = true;
+        braces = ['[', ']'];
+      }
+
+      // Make functions say that they are functions
+      if (typeof value === 'function') {
+        var name = getName(value);
+        var nameSuffix = name ? ': ' + name : '';
+        base = ' [Function' + nameSuffix + ']';
+      }
+
+      // Make RegExps say that they are RegExps
+      if (isRegExp(value)) {
+        base = ' ' + RegExp.prototype.toString.call(value);
+      }
+
+      // Make dates with properties first say the date
+      if (isDate(value)) {
+        base = ' ' + Date.prototype.toUTCString.call(value);
+      }
+
+      // Make error with message first say the error
+      if (isError(value)) {
+        return formatError(value);
+      }
+
+      if (keys.length === 0 && (!array || value.length == 0)) {
+        return braces[0] + base + braces[1];
+      }
+
+      if (recurseTimes < 0) {
+        if (isRegExp(value)) {
+          return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+        } else {
+          return ctx.stylize('[Object]', 'special');
+        }
+      }
+
+      ctx.seen.push(value);
+
+      var output;
+      if (array) {
+        output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+      } else {
+        output = keys.map(function(key) {
+          return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+        });
+      }
+
+      ctx.seen.pop();
+
+      return reduceToSingleString(output, base, braces);
+    }
+
+
+    function formatPrimitive(ctx, value) {
+      switch (typeof value) {
+        case 'undefined':
+          return ctx.stylize('undefined', 'undefined');
+
+        case 'string':
+          var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                                   .replace(/'/g, "\\'")
+                                                   .replace(/\\"/g, '"') + '\'';
+          return ctx.stylize(simple, 'string');
+
+        case 'number':
+          return ctx.stylize('' + value, 'number');
+
+        case 'boolean':
+          return ctx.stylize('' + value, 'boolean');
+      }
+      // For some reason typeof null is "object", so special case here.
+      if (value === null) {
+        return ctx.stylize('null', 'null');
+      }
+    }
+
+
+    function formatError(value) {
+      return '[' + Error.prototype.toString.call(value) + ']';
+    }
+
+
+    function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+      var output = [];
+      for (var i = 0, l = value.length; i < l; ++i) {
+        if (Object.prototype.hasOwnProperty.call(value, String(i))) {
+          output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+              String(i), true));
+        } else {
+          output.push('');
+        }
+      }
+      keys.forEach(function(key) {
+        if (!key.match(/^\d+$/)) {
+          output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+              key, true));
+        }
+      });
+      return output;
+    }
+
+
+    function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+      var name, str;
+      if (value.__lookupGetter__) {
+        if (value.__lookupGetter__(key)) {
+          if (value.__lookupSetter__(key)) {
+            str = ctx.stylize('[Getter/Setter]', 'special');
+          } else {
+            str = ctx.stylize('[Getter]', 'special');
+          }
+        } else {
+          if (value.__lookupSetter__(key)) {
+            str = ctx.stylize('[Setter]', 'special');
+          }
+        }
+      }
+      if (visibleKeys.indexOf(key) < 0) {
+        name = '[' + key + ']';
+      }
+      if (!str) {
+        if (ctx.seen.indexOf(value[key]) < 0) {
+          if (recurseTimes === null) {
+            str = formatValue(ctx, value[key], null);
+          } else {
+            str = formatValue(ctx, value[key], recurseTimes - 1);
+          }
+          if (str.indexOf('\n') > -1) {
+            if (array) {
+              str = str.split('\n').map(function(line) {
+                return '  ' + line;
+              }).join('\n').substr(2);
+            } else {
+              str = '\n' + str.split('\n').map(function(line) {
+                return '   ' + line;
+              }).join('\n');
+            }
+          }
+        } else {
+          str = ctx.stylize('[Circular]', 'special');
+        }
+      }
+      if (typeof name === 'undefined') {
+        if (array && key.match(/^\d+$/)) {
+          return str;
+        }
+        name = JSON.stringify('' + key);
+        if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+          name = name.substr(1, name.length - 2);
+          name = ctx.stylize(name, 'name');
+        } else {
+          name = name.replace(/'/g, "\\'")
+                     .replace(/\\"/g, '"')
+                     .replace(/(^"|"$)/g, "'");
+          name = ctx.stylize(name, 'string');
+        }
+      }
+
+      return name + ': ' + str;
+    }
+
+
+    function reduceToSingleString(output, base, braces) {
+      var numLinesEst = 0;
+      var length = output.reduce(function(prev, cur) {
+        numLinesEst++;
+        if (cur.indexOf('\n') >= 0) numLinesEst++;
+        return prev + cur.length + 1;
+      }, 0);
+
+      if (length > 60) {
+        return braces[0] +
+               (base === '' ? '' : base + '\n ') +
+               ' ' +
+               output.join(',\n  ') +
+               ' ' +
+               braces[1];
+      }
+
+      return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+    }
+
+    function isArray(ar) {
+      return Array.isArray(ar) ||
+             (typeof ar === 'object' && objectToString(ar) === '[object Array]');
+    }
+
+    function isRegExp(re) {
+      return typeof re === 'object' && objectToString(re) === '[object RegExp]';
+    }
+
+    function isDate(d) {
+      return typeof d === 'object' && objectToString(d) === '[object Date]';
+    }
+
+    function isError(e) {
+      return typeof e === 'object' && objectToString(e) === '[object Error]';
+    }
+
+    function objectToString(o) {
+      return Object.prototype.toString.call(o);
+    }
+
+  }); // module: chai/utils/inspect.js
+
+  require.register("chai/utils/objDisplay.js", function(module, exports, require){
+    /*!
+     * Chai - flag utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Module dependancies
+     */
+
+    var inspect = require('./inspect');
+
+    /**
+     * ### .objDisplay (object)
+     *
+     * Determines if an object or an array matches
+     * criteria to be inspected in-line for error
+     * messages or should be truncated.
+     *
+     * @param {Mixed} javascript object to inspect
+     * @name objDisplay
+     * @api public
+     */
+
+    module.exports = function (obj) {
+      var str = inspect(obj)
+        , type = Object.prototype.toString.call(obj);
+
+      if (str.length >= 40) {
+        if (type === '[object Function]') {
+          return !obj.name || obj.name === ''
+            ? '[Function]'
+            : '[Function: ' + obj.name + ']';
+        } else if (type === '[object Array]') {
+          return '[ Array(' + obj.length + ') ]';
+        } else if (type === '[object Object]') {
+          var keys = Object.keys(obj)
+            , kstr = keys.length > 2
+              ? keys.splice(0, 2).join(', ') + ', ...'
+              : keys.join(', ');
+          return '{ Object (' + kstr + ') }';
+        } else {
+          return str;
+        }
+      } else {
+        return str;
+      }
+    };
+
+  }); // module: chai/utils/objDisplay.js
+
+  require.register("chai/utils/overwriteMethod.js", function(module, exports, require){
+    /*!
+     * Chai - overwriteMethod utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### overwriteMethod (ctx, name, fn)
+     *
+     * Overwites an already existing method and provides
+     * access to previous function. Must return function
+     * to be used for name.
+     *
+     *     utils.overwriteMethod(chai.Assertion.prototype, 'equal', function (_super) {
+     *       return function (str) {
+     *         var obj = utils.flag(this, 'object');
+     *         if (obj instanceof Foo) {
+     *           new chai.Assertion(obj.value).to.equal(str);
+     *         } else {
+     *           _super.apply(this, arguments);
+     *         }
+     *       }
+     *     });
+     *
+     * Can also be accessed directly from `chai.Assertion`.
+     *
+     *     chai.Assertion.overwriteMethod('foo', fn);
+     *
+     * Then can be used as any other assertion.
+     *
+     *     expect(myFoo).to.equal('bar');
+     *
+     * @param {Object} ctx object whose method is to be overwritten
+     * @param {String} name of method to overwrite
+     * @param {Function} method function that returns a function to be used for name
+     * @name overwriteMethod
+     * @api public
+     */
+
+    module.exports = function (ctx, name, method) {
+      var _method = ctx[name]
+        , _super = function () { return this; };
+
+      if (_method && 'function' === typeof _method)
+        _super = _method;
+
+      ctx[name] = function () {
+        var result = method(_super).apply(this, arguments);
+        return result === undefined ? this : result;
+      }
+    };
+
+  }); // module: chai/utils/overwriteMethod.js
+
+  require.register("chai/utils/overwriteProperty.js", function(module, exports, require){
+    /*!
+     * Chai - overwriteProperty utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### overwriteProperty (ctx, name, fn)
+     *
+     * Overwites an already existing property getter and provides
+     * access to previous value. Must return function to use as getter.
+     *
+     *     utils.overwriteProperty(chai.Assertion.prototype, 'ok', function (_super) {
+     *       return function () {
+     *         var obj = utils.flag(this, 'object');
+     *         if (obj instanceof Foo) {
+     *           new chai.Assertion(obj.name).to.equal('bar');
+     *         } else {
+     *           _super.call(this);
+     *         }
+     *       }
+     *     });
+     *
+     *
+     * Can also be accessed directly from `chai.Assertion`.
+     *
+     *     chai.Assertion.overwriteProperty('foo', fn);
+     *
+     * Then can be used as any other assertion.
+     *
+     *     expect(myFoo).to.be.ok;
+     *
+     * @param {Object} ctx object whose property is to be overwritten
+     * @param {String} name of property to overwrite
+     * @param {Function} getter function that returns a getter function to be used for name
+     * @name overwriteProperty
+     * @api public
+     */
+
+    module.exports = function (ctx, name, getter) {
+      var _get = Object.getOwnPropertyDescriptor(ctx, name)
+        , _super = function () {};
+
+      if (_get && 'function' === typeof _get.get)
+        _super = _get.get
+
+      Object.defineProperty(ctx, name,
+        { get: function () {
+            var result = getter(_super).call(this);
+            return result === undefined ? this : result;
+          }
+        , configurable: true
+      });
+    };
+
+  }); // module: chai/utils/overwriteProperty.js
+
+  require.register("chai/utils/test.js", function(module, exports, require){
+    /*!
+     * Chai - test utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Module dependancies
+     */
+
+    var flag = require('./flag');
+
+    /**
+     * # test(object, expression)
+     *
+     * Test and object for expression.
+     *
+     * @param {Object} object (constructed Assertion)
+     * @param {Arguments} chai.Assertion.prototype.assert arguments
+     */
+
+    module.exports = function (obj, args) {
+      var negate = flag(obj, 'negate')
+        , expr = args[0];
+      return negate ? !expr : expr;
+    };
+
+  }); // module: chai/utils/test.js
+
+  require.register("chai/utils/transferFlags.js", function(module, exports, require){
+    /*!
+     * Chai - transferFlags utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /**
+     * ### transferFlags(assertion, object, includeAll = true)
+     *
+     * Transfer all the flags for `assertion` to `object`. If
+     * `includeAll` is set to `false`, then the base Chai
+     * assertion flags (namely `object`, `ssfi`, and `message`)
+     * will not be transferred.
+     *
+     *
+     *     var newAssertion = new Assertion();
+     *     utils.transferFlags(assertion, newAssertion);
+     *
+     *     var anotherAsseriton = new Assertion(myObj);
+     *     utils.transferFlags(assertion, anotherAssertion, false);
+     *
+     * @param {Assertion} assertion the assertion to transfer the flags from
+     * @param {Object} object the object to transfer the flags too; usually a new assertion
+     * @param {Boolean} includeAll
+     * @name getAllFlags
+     * @api private
+     */
+
+    module.exports = function (assertion, object, includeAll) {
+      var flags = assertion.__flags || (assertion.__flags = Object.create(null));
+
+      if (!object.__flags) {
+        object.__flags = Object.create(null);
+      }
+
+      includeAll = arguments.length === 3 ? includeAll : true;
+
+      for (var flag in flags) {
+        if (includeAll ||
+            (flag !== 'object' && flag !== 'ssfi' && flag != 'message')) {
+          object.__flags[flag] = flags[flag];
+        }
+      }
+    };
+
+  }); // module: chai/utils/transferFlags.js
+
+  require.register("chai/utils/type.js", function(module, exports, require){
+    /*!
+     * Chai - type utility
+     * Copyright(c) 2012-2013 Jake Luer <jake@alogicalparadox.com>
+     * MIT Licensed
+     */
+
+    /*!
+     * Detectable javascript natives
+     */
+
+    var natives = {
+        '[object Arguments]': 'arguments'
+      , '[object Array]': 'array'
+      , '[object Date]': 'date'
+      , '[object Function]': 'function'
+      , '[object Number]': 'number'
+      , '[object RegExp]': 'regexp'
+      , '[object String]': 'string'
+    };
+
+    /**
+     * ### type(object)
+     *
+     * Better implementation of `typeof` detection that can
+     * be used cross-browser. Handles the inconsistencies of
+     * Array, `null`, and `undefined` detection.
+     *
+     *     utils.type({}) // 'object'
+     *     utils.type(null) // `null'
+     *     utils.type(undefined) // `undefined`
+     *     utils.type([]) // `array`
+     *
+     * @param {Mixed} object to detect type of
+     * @name type
+     * @api private
+     */
+
+    module.exports = function (obj) {
+      var str = Object.prototype.toString.call(obj);
+      if (natives[str]) return natives[str];
+      if (obj === null) return 'null';
+      if (obj === undefined) return 'undefined';
+      if (obj === Object(obj)) return 'object';
+      return typeof obj;
+    };
+
+  }); // module: chai/utils/type.js
+
+  require.alias("./chai.js", "chai");
+
+  return require('chai');
+});
diff --git a/test/vendor/js/sinon-chai.js b/test/vendor/js/sinon-chai.js
new file mode 100755
index 00000000..26cee36a
--- /dev/null
+++ b/test/vendor/js/sinon-chai.js
@@ -0,0 +1,109 @@
+(function (sinonChai) {
+    "use strict";
+
+    // Module systems magic dance.
+
+    if (typeof require === "function" && typeof exports === "object" && typeof module === "object") {
+        // NodeJS
+        module.exports = sinonChai;
+    } else if (typeof define === "function" && define.amd) {
+        // AMD
+        define(function () {
+            return sinonChai;
+        });
+    } else {
+        // Other environment (usually <script> tag): plug in to global chai instance directly.
+        chai.use(sinonChai);
+    }
+}(function sinonChai(chai, utils) {
+    "use strict";
+
+    var slice = Array.prototype.slice;
+
+    function isSpy(putativeSpy) {
+        return typeof putativeSpy === "function" &&
+               typeof putativeSpy.getCall === "function" &&
+               typeof putativeSpy.calledWithExactly === "function";
+    }
+
+    function isCall(putativeCall) {
+        return putativeCall && isSpy(putativeCall.proxy);
+    }
+
+    function assertCanWorkWith(assertion) {
+        if (!isSpy(assertion._obj) && !isCall(assertion._obj)) {
+            throw new TypeError(utils.inspect(assertion._obj) + " is not a spy or a call to a spy!");
+        }
+    }
+
+    function getMessages(spy, action, nonNegatedSuffix, always, args) {
+        var verbPhrase = always ? "always have " : "have ";
+        nonNegatedSuffix = nonNegatedSuffix || "";
+        if (isSpy(spy.proxy)) {
+            spy = spy.proxy;
+        }
+
+        function printfArray(array) {
+            return spy.printf.apply(spy, array);
+        }
+
+        return {
+            affirmative: printfArray(["expected %n to " + verbPhrase + action + nonNegatedSuffix].concat(args)),
+            negative: printfArray(["expected %n to not " + verbPhrase + action].concat(args))
+        };
+    }
+
+    function sinonProperty(name, action, nonNegatedSuffix) {
+        utils.addProperty(chai.Assertion.prototype, name, function () {
+            assertCanWorkWith(this);
+
+            var messages = getMessages(this._obj, action, nonNegatedSuffix, false);
+            this.assert(this._obj[name], messages.affirmative, messages.negative);
+        });
+    }
+
+    function createSinonMethodHandler(sinonName, action, nonNegatedSuffix) {
+        return function () {
+            assertCanWorkWith(this);
+
+            var alwaysSinonMethod = "always" + sinonName[0].toUpperCase() + sinonName.substring(1);
+            var shouldBeAlways = utils.flag(this, "always") && typeof this._obj[alwaysSinonMethod] === "function";
+            var sinonMethod = shouldBeAlways ? alwaysSinonMethod : sinonName;
+
+            var messages = getMessages(this._obj, action, nonNegatedSuffix, shouldBeAlways, slice.call(arguments));
+            this.assert(this._obj[sinonMethod].apply(this._obj, arguments), messages.affirmative, messages.negative);
+        };
+    }
+
+    function sinonMethodAsProperty(name, action, nonNegatedSuffix) {
+        var handler = createSinonMethodHandler(name, action, nonNegatedSuffix);
+        utils.addProperty(chai.Assertion.prototype, name, handler);
+    }
+
+    function exceptionalSinonMethod(chaiName, sinonName, action, nonNegatedSuffix) {
+        var handler = createSinonMethodHandler(sinonName, action, nonNegatedSuffix);
+        utils.addMethod(chai.Assertion.prototype, chaiName, handler);
+    }
+
+    function sinonMethod(name, action, nonNegatedSuffix) {
+        exceptionalSinonMethod(name, name, action, nonNegatedSuffix);
+    }
+
+    utils.addProperty(chai.Assertion.prototype, "always", function () {
+        utils.flag(this, "always", true);
+    });
+
+    sinonProperty("called", "been called", " at least once, but it was never called");
+    sinonProperty("calledOnce", "been called exactly once", ", but it was called %c%C");
+    sinonProperty("calledTwice", "been called exactly twice", ", but it was called %c%C");
+    sinonProperty("calledThrice", "been called exactly thrice", ", but it was called %c%C");
+    sinonMethodAsProperty("calledWithNew", "been called with new");
+    sinonMethod("calledBefore", "been called before %1");
+    sinonMethod("calledAfter", "been called after %1");
+    sinonMethod("calledOn", "been called with %1 as this", ", but it was called with %t instead");
+    sinonMethod("calledWith", "been called with arguments %*", "%C");
+    sinonMethod("calledWithExactly", "been called with exact arguments %*", "%C");
+    sinonMethod("calledWithMatch", "been called with arguments matching %*", "%C");
+    sinonMethod("returned", "returned %1");
+    exceptionalSinonMethod("thrown", "threw", "thrown %1");
+}));
diff --git a/test/vendor/js/sinon.js b/test/vendor/js/sinon.js
new file mode 100755
index 00000000..c0728bbd
--- /dev/null
+++ b/test/vendor/js/sinon.js
@@ -0,0 +1,4153 @@
+/**
+ * Sinon.JS 1.5.2, 2012/11/27
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
+ *
+ * (The BSD License)
+ * 
+ * Copyright (c) 2010-2012, Christian Johansen, christian@cjohansen.no
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ * 
+ *     * Redistributions of source code must retain the above copyright notice,
+ *       this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright notice,
+ *       this list of conditions and the following disclaimer in the documentation
+ *       and/or other materials provided with the distribution.
+ *     * Neither the name of Christian Johansen nor the names of his contributors
+ *       may be used to endorse or promote products derived from this software
+ *       without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+var sinon = (function () {
+"use strict";
+
+var buster = (function (setTimeout, B) {
+    var isNode = typeof require == "function" && typeof module == "object";
+    var div = typeof document != "undefined" && document.createElement("div");
+    var F = function () {};
+
+    var buster = {
+        bind: function bind(obj, methOrProp) {
+            var method = typeof methOrProp == "string" ? obj[methOrProp] : methOrProp;
+            var args = Array.prototype.slice.call(arguments, 2);
+            return function () {
+                var allArgs = args.concat(Array.prototype.slice.call(arguments));
+                return method.apply(obj, allArgs);
+            };
+        },
+
+        partial: function partial(fn) {
+            var args = [].slice.call(arguments, 1);
+            return function () {
+                return fn.apply(this, args.concat([].slice.call(arguments)));
+            };
+        },
+
+        create: function create(object) {
+            F.prototype = object;
+            return new F();
+        },
+
+        extend: function extend(target) {
+            if (!target) { return; }
+            for (var i = 1, l = arguments.length, prop; i < l; ++i) {
+                for (prop in arguments[i]) {
+                    target[prop] = arguments[i][prop];
+                }
+            }
+            return target;
+        },
+
+        nextTick: function nextTick(callback) {
+            if (typeof process != "undefined" && process.nextTick) {
+                return process.nextTick(callback);
+            }
+            setTimeout(callback, 0);
+        },
+
+        functionName: function functionName(func) {
+            if (!func) return "";
+            if (func.displayName) return func.displayName;
+            if (func.name) return func.name;
+            var matches = func.toString().match(/function\s+([^\(]+)/m);
+            return matches && matches[1] || "";
+        },
+
+        isNode: function isNode(obj) {
+            if (!div) return false;
+            try {
+                obj.appendChild(div);
+                obj.removeChild(div);
+            } catch (e) {
+                return false;
+            }
+            return true;
+        },
+
+        isElement: function isElement(obj) {
+            return obj && obj.nodeType === 1 && buster.isNode(obj);
+        },
+
+        isArray: function isArray(arr) {
+            return Object.prototype.toString.call(arr) == "[object Array]";
+        },
+
+        flatten: function flatten(arr) {
+            var result = [], arr = arr || [];
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                result = result.concat(buster.isArray(arr[i]) ? flatten(arr[i]) : arr[i]);
+            }
+            return result;
+        },
+
+        each: function each(arr, callback) {
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                callback(arr[i]);
+            }
+        },
+
+        map: function map(arr, callback) {
+            var results = [];
+            for (var i = 0, l = arr.length; i < l; ++i) {
+                results.push(callback(arr[i]));
+            }
+            return results;
+        },
+
+        parallel: function parallel(fns, callback) {
+            function cb(err, res) {
+                if (typeof callback == "function") {
+                    callback(err, res);
+                    callback = null;
+                }
+            }
+            if (fns.length == 0) { return cb(null, []); }
+            var remaining = fns.length, results = [];
+            function makeDone(num) {
+                return function done(err, result) {
+                    if (err) { return cb(err); }
+                    results[num] = result;
+                    if (--remaining == 0) { cb(null, results); }
+                };
+            }
+            for (var i = 0, l = fns.length; i < l; ++i) {
+                fns[i](makeDone(i));
+            }
+        },
+
+        series: function series(fns, callback) {
+            function cb(err, res) {
+                if (typeof callback == "function") {
+                    callback(err, res);
+                }
+            }
+            var remaining = fns.slice();
+            var results = [];
+            function callNext() {
+                if (remaining.length == 0) return cb(null, results);
+                var promise = remaining.shift()(next);
+                if (promise && typeof promise.then == "function") {
+                    promise.then(buster.partial(next, null), next);
+                }
+            }
+            function next(err, result) {
+                if (err) return cb(err);
+                results.push(result);
+                callNext();
+            }
+            callNext();
+        },
+
+        countdown: function countdown(num, done) {
+            return function () {
+                if (--num == 0) done();
+            };
+        }
+    };
+
+    if (typeof process === "object" &&
+        typeof require === "function" && typeof module === "object") {
+        var crypto = require("crypto");
+        var path = require("path");
+
+        buster.tmpFile = function (fileName) {
+            var hashed = crypto.createHash("sha1");
+            hashed.update(fileName);
+            var tmpfileName = hashed.digest("hex");
+
+            if (process.platform == "win32") {
+                return path.join(process.env["TEMP"], tmpfileName);
+            } else {
+                return path.join("/tmp", tmpfileName);
+            }
+        };
+    }
+
+    if (Array.prototype.some) {
+        buster.some = function (arr, fn, thisp) {
+            return arr.some(fn, thisp);
+        };
+    } else {
+        // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
+        buster.some = function (arr, fun, thisp) {
+                        if (arr == null) { throw new TypeError(); }
+            arr = Object(arr);
+            var len = arr.length >>> 0;
+            if (typeof fun !== "function") { throw new TypeError(); }
+
+            for (var i = 0; i < len; i++) {
+                if (arr.hasOwnProperty(i) && fun.call(thisp, arr[i], i, arr)) {
+                    return true;
+                }
+            }
+
+            return false;
+        };
+    }
+
+    if (Array.prototype.filter) {
+        buster.filter = function (arr, fn, thisp) {
+            return arr.filter(fn, thisp);
+        };
+    } else {
+        // https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/filter
+        buster.filter = function (fn, thisp) {
+                        if (this == null) { throw new TypeError(); }
+
+            var t = Object(this);
+            var len = t.length >>> 0;
+            if (typeof fn != "function") { throw new TypeError(); }
+
+            var res = [];
+            for (var i = 0; i < len; i++) {
+                if (i in t) {
+                    var val = t[i]; // in case fun mutates this
+                    if (fn.call(thisp, val, i, t)) { res.push(val); }
+                }
+            }
+
+            return res;
+        };
+    }
+
+    if (isNode) {
+        module.exports = buster;
+        buster.eventEmitter = require("./buster-event-emitter");
+        Object.defineProperty(buster, "defineVersionGetter", {
+            get: function () {
+                return require("./define-version-getter");
+            }
+        });
+    }
+
+    return buster.extend(B || {}, buster);
+}(setTimeout, buster));
+if (typeof buster === "undefined") {
+    var buster = {};
+}
+
+if (typeof module === "object" && typeof require === "function") {
+    buster = require("buster-core");
+}
+
+buster.format = buster.format || {};
+buster.format.excludeConstructors = ["Object", /^.$/];
+buster.format.quoteStrings = true;
+
+buster.format.ascii = (function () {
+    
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    var specialObjects = [];
+    if (typeof global != "undefined") {
+        specialObjects.push({ obj: global, value: "[object global]" });
+    }
+    if (typeof document != "undefined") {
+        specialObjects.push({ obj: document, value: "[object HTMLDocument]" });
+    }
+    if (typeof window != "undefined") {
+        specialObjects.push({ obj: window, value: "[object Window]" });
+    }
+
+    function keys(object) {
+        var k = Object.keys && Object.keys(object) || [];
+
+        if (k.length == 0) {
+            for (var prop in object) {
+                if (hasOwn.call(object, prop)) {
+                    k.push(prop);
+                }
+            }
+        }
+
+        return k.sort();
+    }
+
+    function isCircular(object, objects) {
+        if (typeof object != "object") {
+            return false;
+        }
+
+        for (var i = 0, l = objects.length; i < l; ++i) {
+            if (objects[i] === object) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    function ascii(object, processed, indent) {
+        if (typeof object == "string") {
+            var quote = typeof this.quoteStrings != "boolean" || this.quoteStrings;
+            return processed || quote ? '"' + object + '"' : object;
+        }
+
+        if (typeof object == "function" && !(object instanceof RegExp)) {
+            return ascii.func(object);
+        }
+
+        processed = processed || [];
+
+        if (isCircular(object, processed)) {
+            return "[Circular]";
+        }
+
+        if (Object.prototype.toString.call(object) == "[object Array]") {
+            return ascii.array.call(this, object, processed);
+        }
+
+        if (!object) {
+            return "" + object;
+        }
+
+        if (buster.isElement(object)) {
+            return ascii.element(object);
+        }
+
+        if (typeof object.toString == "function" &&
+            object.toString !== Object.prototype.toString) {
+            return object.toString();
+        }
+
+        for (var i = 0, l = specialObjects.length; i < l; i++) {
+            if (object === specialObjects[i].obj) {
+                return specialObjects[i].value;
+            }
+        }
+
+        return ascii.object.call(this, object, processed, indent);
+    }
+
+    ascii.func = function (func) {
+        return "function " + buster.functionName(func) + "() {}";
+    };
+
+    ascii.array = function (array, processed) {
+        processed = processed || [];
+        processed.push(array);
+        var pieces = [];
+
+        for (var i = 0, l = array.length; i < l; ++i) {
+            pieces.push(ascii.call(this, array[i], processed));
+        }
+
+        return "[" + pieces.join(", ") + "]";
+    };
+
+    ascii.object = function (object, processed, indent) {
+        processed = processed || [];
+        processed.push(object);
+        indent = indent || 0;
+        var pieces = [], properties = keys(object), prop, str, obj;
+        var is = "";
+        var length = 3;
+
+        for (var i = 0, l = indent; i < l; ++i) {
+            is += " ";
+        }
+
+        for (i = 0, l = properties.length; i < l; ++i) {
+            prop = properties[i];
+            obj = object[prop];
+
+            if (isCircular(obj, processed)) {
+                str = "[Circular]";
+            } else {
+                str = ascii.call(this, obj, processed, indent + 2);
+            }
+
+            str = (/\s/.test(prop) ? '"' + prop + '"' : prop) + ": " + str;
+            length += str.length;
+            pieces.push(str);
+        }
+
+        var cons = ascii.constructorName.call(this, object);
+        var prefix = cons ? "[" + cons + "] " : ""
+
+        return (length + indent) > 80 ?
+            prefix + "{\n  " + is + pieces.join(",\n  " + is) + "\n" + is + "}" :
+            prefix + "{ " + pieces.join(", ") + " }";
+    };
+
+    ascii.element = function (element) {
+        var tagName = element.tagName.toLowerCase();
+        var attrs = element.attributes, attribute, pairs = [], attrName;
+
+        for (var i = 0, l = attrs.length; i < l; ++i) {
+            attribute = attrs.item(i);
+            attrName = attribute.nodeName.toLowerCase().replace("html:", "");
+
+            if (attrName == "contenteditable" && attribute.nodeValue == "inherit") {
+                continue;
+            }
+
+            if (!!attribute.nodeValue) {
+                pairs.push(attrName + "=\"" + attribute.nodeValue + "\"");
+            }
+        }
+
+        var formatted = "<" + tagName + (pairs.length > 0 ? " " : "");
+        var content = element.innerHTML;
+
+        if (content.length > 20) {
+            content = content.substr(0, 20) + "[...]";
+        }
+
+        var res = formatted + pairs.join(" ") + ">" + content + "</" + tagName + ">";
+
+        return res.replace(/ contentEditable="inherit"/, "");
+    };
+
+    ascii.constructorName = function (object) {
+        var name = buster.functionName(object && object.constructor);
+        var excludes = this.excludeConstructors || buster.format.excludeConstructors || [];
+
+        for (var i = 0, l = excludes.length; i < l; ++i) {
+            if (typeof excludes[i] == "string" && excludes[i] == name) {
+                return "";
+            } else if (excludes[i].test && excludes[i].test(name)) {
+                return "";
+            }
+        }
+
+        return name;
+    };
+
+    return ascii;
+}());
+
+if (typeof module != "undefined") {
+    module.exports = buster.format;
+}
+/*jslint eqeqeq: false, onevar: false, forin: true, nomen: false, regexp: false, plusplus: false*/
+/*global module, require, __dirname, document*/
+/**
+ * Sinon core utilities. For internal use only.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+var sinon = (function (buster) {
+    var div = typeof document != "undefined" && document.createElement("div");
+    var hasOwn = Object.prototype.hasOwnProperty;
+
+    function isDOMNode(obj) {
+        var success = false;
+
+        try {
+            obj.appendChild(div);
+            success = div.parentNode == obj;
+        } catch (e) {
+            return false;
+        } finally {
+            try {
+                obj.removeChild(div);
+            } catch (e) {
+                // Remove failed, not much we can do about that
+            }
+        }
+
+        return success;
+    }
+
+    function isElement(obj) {
+        return div && obj && obj.nodeType === 1 && isDOMNode(obj);
+    }
+
+    function isFunction(obj) {
+        return typeof obj === "function" || !!(obj && obj.constructor && obj.call && obj.apply);
+    }
+
+    function mirrorProperties(target, source) {
+        for (var prop in source) {
+            if (!hasOwn.call(target, prop)) {
+                target[prop] = source[prop];
+            }
+        }
+    }
+
+    var sinon = {
+        wrapMethod: function wrapMethod(object, property, method) {
+            if (!object) {
+                throw new TypeError("Should wrap property of object");
+            }
+
+            if (typeof method != "function") {
+                throw new TypeError("Method wrapper should be function");
+            }
+
+            var wrappedMethod = object[property];
+
+            if (!isFunction(wrappedMethod)) {
+                throw new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
+                                    property + " as function");
+            }
+
+            if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
+                throw new TypeError("Attempted to wrap " + property + " which is already wrapped");
+            }
+
+            if (wrappedMethod.calledBefore) {
+                var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
+                throw new TypeError("Attempted to wrap " + property + " which is already " + verb);
+            }
+
+            // IE 8 does not support hasOwnProperty on the window object.
+            var owned = hasOwn.call(object, property);
+            object[property] = method;
+            method.displayName = property;
+
+            method.restore = function () {
+                // For prototype properties try to reset by delete first.
+                // If this fails (ex: localStorage on mobile safari) then force a reset
+                // via direct assignment.
+                if (!owned) {
+                    delete object[property];
+                }
+                if (object[property] === method) {
+                    object[property] = wrappedMethod;
+                }
+            };
+
+            method.restore.sinon = true;
+            mirrorProperties(method, wrappedMethod);
+
+            return method;
+        },
+
+        extend: function extend(target) {
+            for (var i = 1, l = arguments.length; i < l; i += 1) {
+                for (var prop in arguments[i]) {
+                    if (arguments[i].hasOwnProperty(prop)) {
+                        target[prop] = arguments[i][prop];
+                    }
+
+                    // DONT ENUM bug, only care about toString
+                    if (arguments[i].hasOwnProperty("toString") &&
+                        arguments[i].toString != target.toString) {
+                        target.toString = arguments[i].toString;
+                    }
+                }
+            }
+
+            return target;
+        },
+
+        create: function create(proto) {
+            var F = function () {};
+            F.prototype = proto;
+            return new F();
+        },
+
+        deepEqual: function deepEqual(a, b) {
+            if (sinon.match && sinon.match.isMatcher(a)) {
+                return a.test(b);
+            }
+            if (typeof a != "object" || typeof b != "object") {
+                return a === b;
+            }
+
+            if (isElement(a) || isElement(b)) {
+                return a === b;
+            }
+
+            if (a === b) {
+                return true;
+            }
+
+            if ((a === null && b !== null) || (a !== null && b === null)) {
+                return false;
+            }
+
+            var aString = Object.prototype.toString.call(a);
+            if (aString != Object.prototype.toString.call(b)) {
+                return false;
+            }
+
+            if (aString == "[object Array]") {
+                if (a.length !== b.length) {
+                    return false;
+                }
+
+                for (var i = 0, l = a.length; i < l; i += 1) {
+                    if (!deepEqual(a[i], b[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+
+            var prop, aLength = 0, bLength = 0;
+
+            for (prop in a) {
+                aLength += 1;
+
+                if (!deepEqual(a[prop], b[prop])) {
+                    return false;
+                }
+            }
+
+            for (prop in b) {
+                bLength += 1;
+            }
+
+            if (aLength != bLength) {
+                return false;
+            }
+
+            return true;
+        },
+
+        functionName: function functionName(func) {
+            var name = func.displayName || func.name;
+
+            // Use function decomposition as a last resort to get function
+            // name. Does not rely on function decomposition to work - if it
+            // doesn't debugging will be slightly less informative
+            // (i.e. toString will say 'spy' rather than 'myFunc').
+            if (!name) {
+                var matches = func.toString().match(/function ([^\s\(]+)/);
+                name = matches && matches[1];
+            }
+
+            return name;
+        },
+
+        functionToString: function toString() {
+            if (this.getCall && this.callCount) {
+                var thisValue, prop, i = this.callCount;
+
+                while (i--) {
+                    thisValue = this.getCall(i).thisValue;
+
+                    for (prop in thisValue) {
+                        if (thisValue[prop] === this) {
+                            return prop;
+                        }
+                    }
+                }
+            }
+
+            return this.displayName || "sinon fake";
+        },
+
+        getConfig: function (custom) {
+            var config = {};
+            custom = custom || {};
+            var defaults = sinon.defaultConfig;
+
+            for (var prop in defaults) {
+                if (defaults.hasOwnProperty(prop)) {
+                    config[prop] = custom.hasOwnProperty(prop) ? custom[prop] : defaults[prop];
+                }
+            }
+
+            return config;
+        },
+
+        format: function (val) {
+            return "" + val;
+        },
+
+        defaultConfig: {
+            injectIntoThis: true,
+            injectInto: null,
+            properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+            useFakeTimers: true,
+            useFakeServer: true
+        },
+
+        timesInWords: function timesInWords(count) {
+            return count == 1 && "once" ||
+                count == 2 && "twice" ||
+                count == 3 && "thrice" ||
+                (count || 0) + " times";
+        },
+
+        calledInOrder: function (spies) {
+            for (var i = 1, l = spies.length; i < l; i++) {
+                if (!spies[i - 1].calledBefore(spies[i])) {
+                    return false;
+                }
+            }
+
+            return true;
+        },
+
+        orderByFirstCall: function (spies) {
+            return spies.sort(function (a, b) {
+                // uuid, won't ever be equal
+                var aCall = a.getCall(0);
+                var bCall = b.getCall(0);
+                var aId = aCall && aCall.callId || -1;
+                var bId = bCall && bCall.callId || -1;
+
+                return aId < bId ? -1 : 1;
+            });
+        },
+
+        log: function () {},
+
+        logError: function (label, err) {
+            var msg = label + " threw exception: "
+            sinon.log(msg + "[" + err.name + "] " + err.message);
+            if (err.stack) { sinon.log(err.stack); }
+
+            setTimeout(function () {
+                err.message = msg + err.message;
+                throw err;
+            }, 0);
+        },
+
+        typeOf: function (value) {
+            if (value === null) {
+                return "null";
+            }
+            else if (value === undefined) {
+                return "undefined";
+            }
+            var string = Object.prototype.toString.call(value);
+            return string.substring(8, string.length - 1).toLowerCase();
+        }
+    };
+
+    var isNode = typeof module == "object" && typeof require == "function";
+
+    if (isNode) {
+        try {
+            buster = { format: require("buster-format") };
+        } catch (e) {}
+        module.exports = sinon;
+        module.exports.spy = require("./sinon/spy");
+        module.exports.stub = require("./sinon/stub");
+        module.exports.mock = require("./sinon/mock");
+        module.exports.collection = require("./sinon/collection");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.sandbox = require("./sinon/sandbox");
+        module.exports.test = require("./sinon/test");
+        module.exports.testCase = require("./sinon/test_case");
+        module.exports.assert = require("./sinon/assert");
+        module.exports.match = require("./sinon/match");
+    }
+
+    if (buster) {
+        var formatter = sinon.create(buster.format);
+        formatter.quoteStrings = false;
+        sinon.format = function () {
+            return formatter.ascii.apply(formatter, arguments);
+        };
+    } else if (isNode) {
+        try {
+            var util = require("util");
+            sinon.format = function (value) {
+                return typeof value == "object" && value.toString === Object.prototype.toString ? util.inspect(value) : value;
+            };
+        } catch (e) {
+            /* Node, but no util module - would be very old, but better safe than
+             sorry */
+        }
+    }
+
+    return sinon;
+}(typeof buster == "object" && buster));
+
+/* @depend ../sinon.js */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Match functions
+ *
+ * @author Maximilian Antoni (mail@maxantoni.de)
+ * @license BSD
+ *
+ * Copyright (c) 2012 Maximilian Antoni
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function assertType(value, type, name) {
+        var actual = sinon.typeOf(value);
+        if (actual !== type) {
+            throw new TypeError("Expected type of " + name + " to be " +
+                type + ", but was " + actual);
+        }
+    }
+
+    var matcher = {
+        toString: function () {
+            return this.message;
+        }
+    };
+
+    function isMatcher(object) {
+        return matcher.isPrototypeOf(object);
+    }
+
+    function matchObject(expectation, actual) {
+        if (actual === null || actual === undefined) {
+            return false;
+        }
+        for (var key in expectation) {
+            if (expectation.hasOwnProperty(key)) {
+                var exp = expectation[key];
+                var act = actual[key];
+                if (match.isMatcher(exp)) {
+                    if (!exp.test(act)) {
+                        return false;
+                    }
+                } else if (sinon.typeOf(exp) === "object") {
+                    if (!matchObject(exp, act)) {
+                        return false;
+                    }
+                } else if (!sinon.deepEqual(exp, act)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    matcher.or = function (m2) {
+        if (!isMatcher(m2)) {
+            throw new TypeError("Matcher expected");
+        }
+        var m1 = this;
+        var or = sinon.create(matcher);
+        or.test = function (actual) {
+            return m1.test(actual) || m2.test(actual);
+        };
+        or.message = m1.message + ".or(" + m2.message + ")";
+        return or;
+    };
+
+    matcher.and = function (m2) {
+        if (!isMatcher(m2)) {
+            throw new TypeError("Matcher expected");
+        }
+        var m1 = this;
+        var and = sinon.create(matcher);
+        and.test = function (actual) {
+            return m1.test(actual) && m2.test(actual);
+        };
+        and.message = m1.message + ".and(" + m2.message + ")";
+        return and;
+    };
+
+    var match = function (expectation, message) {
+        var m = sinon.create(matcher);
+        var type = sinon.typeOf(expectation);
+        switch (type) {
+        case "object":
+            if (typeof expectation.test === "function") {
+                m.test = function (actual) {
+                    return expectation.test(actual) === true;
+                };
+                m.message = "match(" + sinon.functionName(expectation.test) + ")";
+                return m;
+            }
+            var str = [];
+            for (var key in expectation) {
+                if (expectation.hasOwnProperty(key)) {
+                    str.push(key + ": " + expectation[key]);
+                }
+            }
+            m.test = function (actual) {
+                return matchObject(expectation, actual);
+            };
+            m.message = "match(" + str.join(", ") + ")";
+            break;
+        case "number":
+            m.test = function (actual) {
+                return expectation == actual;
+            };
+            break;
+        case "string":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return actual.indexOf(expectation) !== -1;
+            };
+            m.message = "match(\"" + expectation + "\")";
+            break;
+        case "regexp":
+            m.test = function (actual) {
+                if (typeof actual !== "string") {
+                    return false;
+                }
+                return expectation.test(actual);
+            };
+            break;
+        case "function":
+            m.test = expectation;
+            if (message) {
+                m.message = message;
+            } else {
+                m.message = "match(" + sinon.functionName(expectation) + ")";
+            }
+            break;
+        default:
+            m.test = function (actual) {
+              return sinon.deepEqual(expectation, actual);
+            };
+        }
+        if (!m.message) {
+            m.message = "match(" + expectation + ")";
+        }
+        return m;
+    };
+
+    match.isMatcher = isMatcher;
+
+    match.any = match(function () {
+        return true;
+    }, "any");
+
+    match.defined = match(function (actual) {
+        return actual !== null && actual !== undefined;
+    }, "defined");
+
+    match.truthy = match(function (actual) {
+        return !!actual;
+    }, "truthy");
+
+    match.falsy = match(function (actual) {
+        return !actual;
+    }, "falsy");
+
+    match.same = function (expectation) {
+        return match(function (actual) {
+            return expectation === actual;
+        }, "same(" + expectation + ")");
+    };
+
+    match.typeOf = function (type) {
+        assertType(type, "string", "type");
+        return match(function (actual) {
+            return sinon.typeOf(actual) === type;
+        }, "typeOf(\"" + type + "\")");
+    };
+
+    match.instanceOf = function (type) {
+        assertType(type, "function", "type");
+        return match(function (actual) {
+            return actual instanceof type;
+        }, "instanceOf(" + sinon.functionName(type) + ")");
+    };
+
+    function createPropertyMatcher(propertyTest, messagePrefix) {
+        return function (property, value) {
+            assertType(property, "string", "property");
+            var onlyProperty = arguments.length === 1;
+            var message = messagePrefix + "(\"" + property + "\"";
+            if (!onlyProperty) {
+                message += ", " + value;
+            }
+            message += ")";
+            return match(function (actual) {
+                if (actual === undefined || actual === null ||
+                        !propertyTest(actual, property)) {
+                    return false;
+                }
+                return onlyProperty || sinon.deepEqual(value, actual[property]);
+            }, message);
+        };
+    }
+
+    match.has = createPropertyMatcher(function (actual, property) {
+        if (typeof actual === "object") {
+            return property in actual;
+        }
+        return actual[property] !== undefined;
+    }, "has");
+
+    match.hasOwn = createPropertyMatcher(function (actual, property) {
+        return actual.hasOwnProperty(property);
+    }, "hasOwn");
+
+    match.bool = match.typeOf("boolean");
+    match.number = match.typeOf("number");
+    match.string = match.typeOf("string");
+    match.object = match.typeOf("object");
+    match.func = match.typeOf("function");
+    match.array = match.typeOf("array");
+    match.regexp = match.typeOf("regexp");
+    match.date = match.typeOf("date");
+
+    if (commonJSModule) {
+        module.exports = match;
+    } else {
+        sinon.match = match;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend match.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Spy functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+    var spyCall;
+    var callId = 0;
+    var push = [].push;
+    var slice = Array.prototype.slice;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function spy(object, property) {
+        if (!property && typeof object == "function") {
+            return spy.create(object);
+        }
+
+        if (!object && !property) {
+            return spy.create(function () {});
+        }
+
+        var method = object[property];
+        return sinon.wrapMethod(object, property, spy.create(method));
+    }
+
+    sinon.extend(spy, (function () {
+
+        function delegateToCalls(api, method, matchAny, actual, notCalled) {
+            api[method] = function () {
+                if (!this.called) {
+                    if (notCalled) {
+                        return notCalled.apply(this, arguments);
+                    }
+                    return false;
+                }
+
+                var currentCall;
+                var matches = 0;
+
+                for (var i = 0, l = this.callCount; i < l; i += 1) {
+                    currentCall = this.getCall(i);
+
+                    if (currentCall[actual || method].apply(currentCall, arguments)) {
+                        matches += 1;
+
+                        if (matchAny) {
+                            return true;
+                        }
+                    }
+                }
+
+                return matches === this.callCount;
+            };
+        }
+
+        function matchingFake(fakes, args, strict) {
+            if (!fakes) {
+                return;
+            }
+
+            var alen = args.length;
+
+            for (var i = 0, l = fakes.length; i < l; i++) {
+                if (fakes[i].matches(args, strict)) {
+                    return fakes[i];
+                }
+            }
+        }
+
+        function incrementCallCount() {
+            this.called = true;
+            this.callCount += 1;
+            this.notCalled = false;
+            this.calledOnce = this.callCount == 1;
+            this.calledTwice = this.callCount == 2;
+            this.calledThrice = this.callCount == 3;
+        }
+
+        function createCallProperties() {
+            this.firstCall = this.getCall(0);
+            this.secondCall = this.getCall(1);
+            this.thirdCall = this.getCall(2);
+            this.lastCall = this.getCall(this.callCount - 1);
+        }
+
+        var vars = "a,b,c,d,e,f,g,h,i,j,k,l";
+        function createProxy(func) {
+            // Retain the function length:
+            var p;
+            if (func.length) {
+                eval("p = (function proxy(" + vars.substring(0, func.length * 2 - 1) +
+                  ") { return p.invoke(func, this, slice.call(arguments)); });");
+            }
+            else {
+                p = function proxy() {
+                    return p.invoke(func, this, slice.call(arguments));
+                };
+            }
+            return p;
+        }
+
+        var uuid = 0;
+
+        // Public API
+        var spyApi = {
+            reset: function () {
+                this.called = false;
+                this.notCalled = true;
+                this.calledOnce = false;
+                this.calledTwice = false;
+                this.calledThrice = false;
+                this.callCount = 0;
+                this.firstCall = null;
+                this.secondCall = null;
+                this.thirdCall = null;
+                this.lastCall = null;
+                this.args = [];
+                this.returnValues = [];
+                this.thisValues = [];
+                this.exceptions = [];
+                this.callIds = [];
+                if (this.fakes) {
+                    for (var i = 0; i < this.fakes.length; i++) {
+                        this.fakes[i].reset();
+                    }
+                }
+            },
+
+            create: function create(func) {
+                var name;
+
+                if (typeof func != "function") {
+                    func = function () {};
+                } else {
+                    name = sinon.functionName(func);
+                }
+
+                var proxy = createProxy(func);
+
+                sinon.extend(proxy, spy);
+                delete proxy.create;
+                sinon.extend(proxy, func);
+
+                proxy.reset();
+                proxy.prototype = func.prototype;
+                proxy.displayName = name || "spy";
+                proxy.toString = sinon.functionToString;
+                proxy._create = sinon.spy.create;
+                proxy.id = "spy#" + uuid++;
+
+                return proxy;
+            },
+
+            invoke: function invoke(func, thisValue, args) {
+                var matching = matchingFake(this.fakes, args);
+                var exception, returnValue;
+
+                incrementCallCount.call(this);
+                push.call(this.thisValues, thisValue);
+                push.call(this.args, args);
+                push.call(this.callIds, callId++);
+
+                try {
+                    if (matching) {
+                        returnValue = matching.invoke(func, thisValue, args);
+                    } else {
+                        returnValue = (this.func || func).apply(thisValue, args);
+                    }
+                } catch (e) {
+                    push.call(this.returnValues, undefined);
+                    exception = e;
+                    throw e;
+                } finally {
+                    push.call(this.exceptions, exception);
+                }
+
+                push.call(this.returnValues, returnValue);
+
+                createCallProperties.call(this);
+
+                return returnValue;
+            },
+
+            getCall: function getCall(i) {
+                if (i < 0 || i >= this.callCount) {
+                    return null;
+                }
+
+                return spyCall.create(this, this.thisValues[i], this.args[i],
+                                      this.returnValues[i], this.exceptions[i],
+                                      this.callIds[i]);
+            },
+
+            calledBefore: function calledBefore(spyFn) {
+                if (!this.called) {
+                    return false;
+                }
+
+                if (!spyFn.called) {
+                    return true;
+                }
+
+                return this.callIds[0] < spyFn.callIds[spyFn.callIds.length - 1];
+            },
+
+            calledAfter: function calledAfter(spyFn) {
+                if (!this.called || !spyFn.called) {
+                    return false;
+                }
+
+                return this.callIds[this.callCount - 1] > spyFn.callIds[spyFn.callCount - 1];
+            },
+
+            withArgs: function () {
+                var args = slice.call(arguments);
+
+                if (this.fakes) {
+                    var match = matchingFake(this.fakes, args, true);
+
+                    if (match) {
+                        return match;
+                    }
+                } else {
+                    this.fakes = [];
+                }
+
+                var original = this;
+                var fake = this._create();
+                fake.matchingAguments = args;
+                push.call(this.fakes, fake);
+
+                fake.withArgs = function () {
+                    return original.withArgs.apply(original, arguments);
+                };
+
+                for (var i = 0; i < this.args.length; i++) {
+                    if (fake.matches(this.args[i])) {
+                        incrementCallCount.call(fake);
+                        push.call(fake.thisValues, this.thisValues[i]);
+                        push.call(fake.args, this.args[i]);
+                        push.call(fake.returnValues, this.returnValues[i]);
+                        push.call(fake.exceptions, this.exceptions[i]);
+                        push.call(fake.callIds, this.callIds[i]);
+                    }
+                }
+                createCallProperties.call(fake);
+
+                return fake;
+            },
+
+            matches: function (args, strict) {
+                var margs = this.matchingAguments;
+
+                if (margs.length <= args.length &&
+                    sinon.deepEqual(margs, args.slice(0, margs.length))) {
+                    return !strict || margs.length == args.length;
+                }
+            },
+
+            printf: function (format) {
+                var spy = this;
+                var args = slice.call(arguments, 1);
+                var formatter;
+
+                return (format || "").replace(/%(.)/g, function (match, specifyer) {
+                    formatter = spyApi.formatters[specifyer];
+
+                    if (typeof formatter == "function") {
+                        return formatter.call(null, spy, args);
+                    } else if (!isNaN(parseInt(specifyer), 10)) {
+                        return sinon.format(args[specifyer - 1]);
+                    }
+
+                    return "%" + specifyer;
+                });
+            }
+        };
+
+        delegateToCalls(spyApi, "calledOn", true);
+        delegateToCalls(spyApi, "alwaysCalledOn", false, "calledOn");
+        delegateToCalls(spyApi, "calledWith", true);
+        delegateToCalls(spyApi, "calledWithMatch", true);
+        delegateToCalls(spyApi, "alwaysCalledWith", false, "calledWith");
+        delegateToCalls(spyApi, "alwaysCalledWithMatch", false, "calledWithMatch");
+        delegateToCalls(spyApi, "calledWithExactly", true);
+        delegateToCalls(spyApi, "alwaysCalledWithExactly", false, "calledWithExactly");
+        delegateToCalls(spyApi, "neverCalledWith", false, "notCalledWith",
+            function () { return true; });
+        delegateToCalls(spyApi, "neverCalledWithMatch", false, "notCalledWithMatch",
+            function () { return true; });
+        delegateToCalls(spyApi, "threw", true);
+        delegateToCalls(spyApi, "alwaysThrew", false, "threw");
+        delegateToCalls(spyApi, "returned", true);
+        delegateToCalls(spyApi, "alwaysReturned", false, "returned");
+        delegateToCalls(spyApi, "calledWithNew", true);
+        delegateToCalls(spyApi, "alwaysCalledWithNew", false, "calledWithNew");
+        delegateToCalls(spyApi, "callArg", false, "callArgWith", function () {
+            throw new Error(this.toString() + " cannot call arg since it was not yet invoked.");
+        });
+        spyApi.callArgWith = spyApi.callArg;
+        delegateToCalls(spyApi, "yield", false, "yield", function () {
+            throw new Error(this.toString() + " cannot yield since it was not yet invoked.");
+        });
+        // "invokeCallback" is an alias for "yield" since "yield" is invalid in strict mode.
+        spyApi.invokeCallback = spyApi.yield;
+        delegateToCalls(spyApi, "yieldTo", false, "yieldTo", function (property) {
+            throw new Error(this.toString() + " cannot yield to '" + property +
+                "' since it was not yet invoked.");
+        });
+
+        spyApi.formatters = {
+            "c": function (spy) {
+                return sinon.timesInWords(spy.callCount);
+            },
+
+            "n": function (spy) {
+                return spy.toString();
+            },
+
+            "C": function (spy) {
+                var calls = [];
+
+                for (var i = 0, l = spy.callCount; i < l; ++i) {
+                    push.call(calls, "    " + spy.getCall(i).toString());
+                }
+
+                return calls.length > 0 ? "\n" + calls.join("\n") : "";
+            },
+
+            "t": function (spy) {
+                var objects = [];
+
+                for (var i = 0, l = spy.callCount; i < l; ++i) {
+                    push.call(objects, sinon.format(spy.thisValues[i]));
+                }
+
+                return objects.join(", ");
+            },
+
+            "*": function (spy, args) {
+                var formatted = [];
+
+                for (var i = 0, l = args.length; i < l; ++i) {
+                    push.call(formatted, sinon.format(args[i]));
+                }
+
+                return formatted.join(", ");
+            }
+        };
+
+        return spyApi;
+    }()));
+
+    spyCall = (function () {
+
+        function throwYieldError(proxy, text, args) {
+            var msg = sinon.functionName(proxy) + text;
+            if (args.length) {
+                msg += " Received [" + slice.call(args).join(", ") + "]";
+            }
+            throw new Error(msg);
+        }
+
+        var callApi = {
+            create: function create(spy, thisValue, args, returnValue, exception, id) {
+                var proxyCall = sinon.create(spyCall);
+                delete proxyCall.create;
+                proxyCall.proxy = spy;
+                proxyCall.thisValue = thisValue;
+                proxyCall.args = args;
+                proxyCall.returnValue = returnValue;
+                proxyCall.exception = exception;
+                proxyCall.callId = typeof id == "number" && id || callId++;
+
+                return proxyCall;
+            },
+
+            calledOn: function calledOn(thisValue) {
+                if (sinon.match && sinon.match.isMatcher(thisValue)) {
+                    return thisValue.test(this.thisValue);
+                }
+                return this.thisValue === thisValue;
+            },
+
+            calledWith: function calledWith() {
+                for (var i = 0, l = arguments.length; i < l; i += 1) {
+                    if (!sinon.deepEqual(arguments[i], this.args[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            },
+
+            calledWithMatch: function calledWithMatch() {
+              for (var i = 0, l = arguments.length; i < l; i += 1) {
+                  var actual = this.args[i];
+                  var expectation = arguments[i];
+                  if (!sinon.match || !sinon.match(expectation).test(actual)) {
+                      return false;
+                  }
+              }
+              return true;
+            },
+
+            calledWithExactly: function calledWithExactly() {
+                return arguments.length == this.args.length &&
+                    this.calledWith.apply(this, arguments);
+            },
+
+            notCalledWith: function notCalledWith() {
+                return !this.calledWith.apply(this, arguments);
+            },
+
+            notCalledWithMatch: function notCalledWithMatch() {
+              return !this.calledWithMatch.apply(this, arguments);
+            },
+
+            returned: function returned(value) {
+                return sinon.deepEqual(value, this.returnValue);
+            },
+
+            threw: function threw(error) {
+                if (typeof error == "undefined" || !this.exception) {
+                    return !!this.exception;
+                }
+
+                if (typeof error == "string") {
+                    return this.exception.name == error;
+                }
+
+                return this.exception === error;
+            },
+
+            calledWithNew: function calledWithNew(thisValue) {
+                return this.thisValue instanceof this.proxy;
+            },
+
+            calledBefore: function (other) {
+                return this.callId < other.callId;
+            },
+
+            calledAfter: function (other) {
+                return this.callId > other.callId;
+            },
+
+            callArg: function (pos) {
+                this.args[pos]();
+            },
+
+            callArgWith: function (pos) {
+                var args = slice.call(arguments, 1);
+                this.args[pos].apply(null, args);
+            },
+
+            "yield": function () {
+                var args = this.args;
+                for (var i = 0, l = args.length; i < l; ++i) {
+                    if (typeof args[i] === "function") {
+                        args[i].apply(null, slice.call(arguments));
+                        return;
+                    }
+                }
+                throwYieldError(this.proxy, " cannot yield since no callback was passed.", args);
+            },
+
+            yieldTo: function (prop) {
+                var args = this.args;
+                for (var i = 0, l = args.length; i < l; ++i) {
+                    if (args[i] && typeof args[i][prop] === "function") {
+                        args[i][prop].apply(null, slice.call(arguments, 1));
+                        return;
+                    }
+                }
+                throwYieldError(this.proxy, " cannot yield to '" + prop +
+                    "' since no callback was passed.", args);
+            },
+
+            toString: function () {
+                var callStr = this.proxy.toString() + "(";
+                var args = [];
+
+                for (var i = 0, l = this.args.length; i < l; ++i) {
+                    push.call(args, sinon.format(this.args[i]));
+                }
+
+                callStr = callStr + args.join(", ") + ")";
+
+                if (typeof this.returnValue != "undefined") {
+                    callStr += " => " + sinon.format(this.returnValue);
+                }
+
+                if (this.exception) {
+                    callStr += " !" + this.exception.name;
+
+                    if (this.exception.message) {
+                        callStr += "(" + this.exception.message + ")";
+                    }
+                }
+
+                return callStr;
+            }
+        };
+        callApi.invokeCallback = callApi.yield;
+        return callApi;
+    }());
+
+    spy.spyCall = spyCall;
+
+    // This steps outside the module sandbox and will be removed
+    sinon.spyCall = spyCall;
+
+    if (commonJSModule) {
+        module.exports = spy;
+    } else {
+        sinon.spy = spy;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend spy.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global module, require, sinon*/
+/**
+ * Stub functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function stub(object, property, func) {
+        if (!!func && typeof func != "function") {
+            throw new TypeError("Custom stub should be function");
+        }
+
+        var wrapper;
+
+        if (func) {
+            wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
+        } else {
+            wrapper = stub.create();
+        }
+
+        if (!object && !property) {
+            return sinon.stub.create();
+        }
+
+        if (!property && !!object && typeof object == "object") {
+            for (var prop in object) {
+                if (typeof object[prop] === "function") {
+                    stub(object, prop);
+                }
+            }
+
+            return object;
+        }
+
+        return sinon.wrapMethod(object, property, wrapper);
+    }
+
+    function getChangingValue(stub, property) {
+        var index = stub.callCount - 1;
+        var prop = index in stub[property] ? stub[property][index] : stub[property + "Last"];
+        stub[property + "Last"] = prop;
+
+        return prop;
+    }
+
+    function getCallback(stub, args) {
+        var callArgAt = getChangingValue(stub, "callArgAts");
+
+        if (callArgAt < 0) {
+            var callArgProp = getChangingValue(stub, "callArgProps");
+
+            for (var i = 0, l = args.length; i < l; ++i) {
+                if (!callArgProp && typeof args[i] == "function") {
+                    return args[i];
+                }
+
+                if (callArgProp && args[i] &&
+                    typeof args[i][callArgProp] == "function") {
+                    return args[i][callArgProp];
+                }
+            }
+
+            return null;
+        }
+
+        return args[callArgAt];
+    }
+
+    var join = Array.prototype.join;
+
+    function getCallbackError(stub, func, args) {
+        if (stub.callArgAtsLast < 0) {
+            var msg;
+
+            if (stub.callArgPropsLast) {
+                msg = sinon.functionName(stub) +
+                    " expected to yield to '" + stub.callArgPropsLast +
+                    "', but no object with such a property was passed."
+            } else {
+                msg = sinon.functionName(stub) +
+                            " expected to yield, but no callback was passed."
+            }
+
+            if (args.length > 0) {
+                msg += " Received [" + join.call(args, ", ") + "]";
+            }
+
+            return msg;
+        }
+
+        return "argument at index " + stub.callArgAtsLast + " is not a function: " + func;
+    }
+
+    var nextTick = (function () {
+        if (typeof process === "object" && typeof process.nextTick === "function") {
+            return process.nextTick;
+        } else if (typeof msSetImmediate === "function") {
+            return msSetImmediate.bind(window);
+        } else if (typeof setImmediate === "function") {
+            return setImmediate;
+        } else {
+            return function (callback) {
+                setTimeout(callback, 0);
+            };
+        }
+    })();
+
+    function callCallback(stub, args) {
+        if (stub.callArgAts.length > 0) {
+            var func = getCallback(stub, args);
+
+            if (typeof func != "function") {
+                throw new TypeError(getCallbackError(stub, func, args));
+            }
+
+            var index = stub.callCount - 1;
+
+            var callbackArguments = getChangingValue(stub, "callbackArguments");
+            var callbackContext = getChangingValue(stub, "callbackContexts");
+
+            if (stub.callbackAsync) {
+                nextTick(function() {
+                    func.apply(callbackContext, callbackArguments);
+                });
+            } else {
+                func.apply(callbackContext, callbackArguments);
+            }
+        }
+    }
+
+    var uuid = 0;
+
+    sinon.extend(stub, (function () {
+        var slice = Array.prototype.slice, proto;
+
+        function throwsException(error, message) {
+            if (typeof error == "string") {
+                this.exception = new Error(message || "");
+                this.exception.name = error;
+            } else if (!error) {
+                this.exception = new Error("Error");
+            } else {
+                this.exception = error;
+            }
+
+            return this;
+        }
+
+        proto = {
+            create: function create() {
+                var functionStub = function () {
+
+                    callCallback(functionStub, arguments);
+
+                    if (functionStub.exception) {
+                        throw functionStub.exception;
+                    } else if (typeof functionStub.returnArgAt == 'number') {
+                        return arguments[functionStub.returnArgAt];
+                    } else if (functionStub.returnThis) {
+                        return this;
+                    }
+                    return functionStub.returnValue;
+                };
+
+                functionStub.id = "stub#" + uuid++;
+                var orig = functionStub;
+                functionStub = sinon.spy.create(functionStub);
+                functionStub.func = orig;
+
+                functionStub.callArgAts = [];
+                functionStub.callbackArguments = [];
+                functionStub.callbackContexts = [];
+                functionStub.callArgProps = [];
+
+                sinon.extend(functionStub, stub);
+                functionStub._create = sinon.stub.create;
+                functionStub.displayName = "stub";
+                functionStub.toString = sinon.functionToString;
+
+                return functionStub;
+            },
+
+            returns: function returns(value) {
+                this.returnValue = value;
+
+                return this;
+            },
+
+            returnsArg: function returnsArg(pos) {
+                if (typeof pos != "number") {
+                    throw new TypeError("argument index is not number");
+                }
+
+                this.returnArgAt = pos;
+
+                return this;
+            },
+
+            returnsThis: function returnsThis() {
+                this.returnThis = true;
+
+                return this;
+            },
+
+            "throws": throwsException,
+            throwsException: throwsException,
+
+            callsArg: function callsArg(pos) {
+                if (typeof pos != "number") {
+                    throw new TypeError("argument index is not number");
+                }
+
+                this.callArgAts.push(pos);
+                this.callbackArguments.push([]);
+                this.callbackContexts.push(undefined);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            callsArgOn: function callsArgOn(pos, context) {
+                if (typeof pos != "number") {
+                    throw new TypeError("argument index is not number");
+                }
+                if (typeof context != "object") {
+                    throw new TypeError("argument context is not an object");
+                }
+
+                this.callArgAts.push(pos);
+                this.callbackArguments.push([]);
+                this.callbackContexts.push(context);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            callsArgWith: function callsArgWith(pos) {
+                if (typeof pos != "number") {
+                    throw new TypeError("argument index is not number");
+                }
+
+                this.callArgAts.push(pos);
+                this.callbackArguments.push(slice.call(arguments, 1));
+                this.callbackContexts.push(undefined);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            callsArgOnWith: function callsArgWith(pos, context) {
+                if (typeof pos != "number") {
+                    throw new TypeError("argument index is not number");
+                }
+                if (typeof context != "object") {
+                    throw new TypeError("argument context is not an object");
+                }
+
+                this.callArgAts.push(pos);
+                this.callbackArguments.push(slice.call(arguments, 2));
+                this.callbackContexts.push(context);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            yields: function () {
+                this.callArgAts.push(-1);
+                this.callbackArguments.push(slice.call(arguments, 0));
+                this.callbackContexts.push(undefined);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            yieldsOn: function (context) {
+                if (typeof context != "object") {
+                    throw new TypeError("argument context is not an object");
+                }
+
+                this.callArgAts.push(-1);
+                this.callbackArguments.push(slice.call(arguments, 1));
+                this.callbackContexts.push(context);
+                this.callArgProps.push(undefined);
+
+                return this;
+            },
+
+            yieldsTo: function (prop) {
+                this.callArgAts.push(-1);
+                this.callbackArguments.push(slice.call(arguments, 1));
+                this.callbackContexts.push(undefined);
+                this.callArgProps.push(prop);
+
+                return this;
+            },
+
+            yieldsToOn: function (prop, context) {
+                if (typeof context != "object") {
+                    throw new TypeError("argument context is not an object");
+                }
+
+                this.callArgAts.push(-1);
+                this.callbackArguments.push(slice.call(arguments, 2));
+                this.callbackContexts.push(context);
+                this.callArgProps.push(prop);
+
+                return this;
+            }
+        };
+
+        // create asynchronous versions of callsArg* and yields* methods
+        for (var method in proto) {
+            // need to avoid creating anotherasync versions of the newly added async methods
+            if (proto.hasOwnProperty(method) &&
+                method.match(/^(callsArg|yields|thenYields$)/) &&
+                !method.match(/Async/)) {
+                proto[method + 'Async'] = (function (syncFnName) {
+                    return function () {
+                        this.callbackAsync = true;
+                        return this[syncFnName].apply(this, arguments);
+                    };
+                })(method);
+            }
+        }
+
+        return proto;
+
+    }()));
+
+    if (commonJSModule) {
+        module.exports = stub;
+    } else {
+        sinon.stub = stub;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false*/
+/*global module, require, sinon*/
+/**
+ * Mock functions.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+    var push = [].push;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function mock(object) {
+        if (!object) {
+            return sinon.expectation.create("Anonymous mock");
+        }
+
+        return mock.create(object);
+    }
+
+    sinon.mock = mock;
+
+    sinon.extend(mock, (function () {
+        function each(collection, callback) {
+            if (!collection) {
+                return;
+            }
+
+            for (var i = 0, l = collection.length; i < l; i += 1) {
+                callback(collection[i]);
+            }
+        }
+
+        return {
+            create: function create(object) {
+                if (!object) {
+                    throw new TypeError("object is null");
+                }
+
+                var mockObject = sinon.extend({}, mock);
+                mockObject.object = object;
+                delete mockObject.create;
+
+                return mockObject;
+            },
+
+            expects: function expects(method) {
+                if (!method) {
+                    throw new TypeError("method is falsy");
+                }
+
+                if (!this.expectations) {
+                    this.expectations = {};
+                    this.proxies = [];
+                }
+
+                if (!this.expectations[method]) {
+                    this.expectations[method] = [];
+                    var mockObject = this;
+
+                    sinon.wrapMethod(this.object, method, function () {
+                        return mockObject.invokeMethod(method, this, arguments);
+                    });
+
+                    push.call(this.proxies, method);
+                }
+
+                var expectation = sinon.expectation.create(method);
+                push.call(this.expectations[method], expectation);
+
+                return expectation;
+            },
+
+            restore: function restore() {
+                var object = this.object;
+
+                each(this.proxies, function (proxy) {
+                    if (typeof object[proxy].restore == "function") {
+                        object[proxy].restore();
+                    }
+                });
+            },
+
+            verify: function verify() {
+                var expectations = this.expectations || {};
+                var messages = [], met = [];
+
+                each(this.proxies, function (proxy) {
+                    each(expectations[proxy], function (expectation) {
+                        if (!expectation.met()) {
+                            push.call(messages, expectation.toString());
+                        } else {
+                            push.call(met, expectation.toString());
+                        }
+                    });
+                });
+
+                this.restore();
+
+                if (messages.length > 0) {
+                    sinon.expectation.fail(messages.concat(met).join("\n"));
+                } else {
+                    sinon.expectation.pass(messages.concat(met).join("\n"));
+                }
+
+                return true;
+            },
+
+            invokeMethod: function invokeMethod(method, thisValue, args) {
+                var expectations = this.expectations && this.expectations[method];
+                var length = expectations && expectations.length || 0, i;
+
+                for (i = 0; i < length; i += 1) {
+                    if (!expectations[i].met() &&
+                        expectations[i].allowsCall(thisValue, args)) {
+                        return expectations[i].apply(thisValue, args);
+                    }
+                }
+
+                var messages = [], available, exhausted = 0;
+
+                for (i = 0; i < length; i += 1) {
+                    if (expectations[i].allowsCall(thisValue, args)) {
+                        available = available || expectations[i];
+                    } else {
+                        exhausted += 1;
+                    }
+                    push.call(messages, "    " + expectations[i].toString());
+                }
+
+                if (exhausted === 0) {
+                    return available.apply(thisValue, args);
+                }
+
+                messages.unshift("Unexpected call: " + sinon.spyCall.toString.call({
+                    proxy: method,
+                    args: args
+                }));
+
+                sinon.expectation.fail(messages.join("\n"));
+            }
+        };
+    }()));
+
+    var times = sinon.timesInWords;
+
+    sinon.expectation = (function () {
+        var slice = Array.prototype.slice;
+        var _invoke = sinon.spy.invoke;
+
+        function callCountInWords(callCount) {
+            if (callCount == 0) {
+                return "never called";
+            } else {
+                return "called " + times(callCount);
+            }
+        }
+
+        function expectedCallCountInWords(expectation) {
+            var min = expectation.minCalls;
+            var max = expectation.maxCalls;
+
+            if (typeof min == "number" && typeof max == "number") {
+                var str = times(min);
+
+                if (min != max) {
+                    str = "at least " + str + " and at most " + times(max);
+                }
+
+                return str;
+            }
+
+            if (typeof min == "number") {
+                return "at least " + times(min);
+            }
+
+            return "at most " + times(max);
+        }
+
+        function receivedMinCalls(expectation) {
+            var hasMinLimit = typeof expectation.minCalls == "number";
+            return !hasMinLimit || expectation.callCount >= expectation.minCalls;
+        }
+
+        function receivedMaxCalls(expectation) {
+            if (typeof expectation.maxCalls != "number") {
+                return false;
+            }
+
+            return expectation.callCount == expectation.maxCalls;
+        }
+
+        return {
+            minCalls: 1,
+            maxCalls: 1,
+
+            create: function create(methodName) {
+                var expectation = sinon.extend(sinon.stub.create(), sinon.expectation);
+                delete expectation.create;
+                expectation.method = methodName;
+
+                return expectation;
+            },
+
+            invoke: function invoke(func, thisValue, args) {
+                this.verifyCallAllowed(thisValue, args);
+
+                return _invoke.apply(this, arguments);
+            },
+
+            atLeast: function atLeast(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.maxCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.minCalls = num;
+
+                return this;
+            },
+
+            atMost: function atMost(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not number");
+                }
+
+                if (!this.limitsSet) {
+                    this.minCalls = null;
+                    this.limitsSet = true;
+                }
+
+                this.maxCalls = num;
+
+                return this;
+            },
+
+            never: function never() {
+                return this.exactly(0);
+            },
+
+            once: function once() {
+                return this.exactly(1);
+            },
+
+            twice: function twice() {
+                return this.exactly(2);
+            },
+
+            thrice: function thrice() {
+                return this.exactly(3);
+            },
+
+            exactly: function exactly(num) {
+                if (typeof num != "number") {
+                    throw new TypeError("'" + num + "' is not a number");
+                }
+
+                this.atLeast(num);
+                return this.atMost(num);
+            },
+
+            met: function met() {
+                return !this.failed && receivedMinCalls(this);
+            },
+
+            verifyCallAllowed: function verifyCallAllowed(thisValue, args) {
+                if (receivedMaxCalls(this)) {
+                    this.failed = true;
+                    sinon.expectation.fail(this.method + " already called " + times(this.maxCalls));
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    sinon.expectation.fail(this.method + " called with " + thisValue + " as thisValue, expected " +
+                        this.expectedThis);
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return;
+                }
+
+                if (!args) {
+                    sinon.expectation.fail(this.method + " received no arguments, expected " +
+                        sinon.format(this.expectedArguments));
+                }
+
+                if (args.length < this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too few arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    sinon.expectation.fail(this.method + " received too many arguments (" + sinon.format(args) +
+                        "), expected " + sinon.format(this.expectedArguments));
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        sinon.expectation.fail(this.method + " received wrong arguments " + sinon.format(args) +
+                            ", expected " + sinon.format(this.expectedArguments));
+                    }
+                }
+            },
+
+            allowsCall: function allowsCall(thisValue, args) {
+                if (this.met() && receivedMaxCalls(this)) {
+                    return false;
+                }
+
+                if ("expectedThis" in this && this.expectedThis !== thisValue) {
+                    return false;
+                }
+
+                if (!("expectedArguments" in this)) {
+                    return true;
+                }
+
+                args = args || [];
+
+                if (args.length < this.expectedArguments.length) {
+                    return false;
+                }
+
+                if (this.expectsExactArgCount &&
+                    args.length != this.expectedArguments.length) {
+                    return false;
+                }
+
+                for (var i = 0, l = this.expectedArguments.length; i < l; i += 1) {
+                    if (!sinon.deepEqual(this.expectedArguments[i], args[i])) {
+                        return false;
+                    }
+                }
+
+                return true;
+            },
+
+            withArgs: function withArgs() {
+                this.expectedArguments = slice.call(arguments);
+                return this;
+            },
+
+            withExactArgs: function withExactArgs() {
+                this.withArgs.apply(this, arguments);
+                this.expectsExactArgCount = true;
+                return this;
+            },
+
+            on: function on(thisValue) {
+                this.expectedThis = thisValue;
+                return this;
+            },
+
+            toString: function () {
+                var args = (this.expectedArguments || []).slice();
+
+                if (!this.expectsExactArgCount) {
+                    push.call(args, "[...]");
+                }
+
+                var callStr = sinon.spyCall.toString.call({
+                    proxy: this.method, args: args
+                });
+
+                var message = callStr.replace(", [...", "[, ...") + " " +
+                    expectedCallCountInWords(this);
+
+                if (this.met()) {
+                    return "Expectation met: " + message;
+                }
+
+                return "Expected " + message + " (" +
+                    callCountInWords(this.callCount) + ")";
+            },
+
+            verify: function verify() {
+                if (!this.met()) {
+                    sinon.expectation.fail(this.toString());
+                } else {
+                    sinon.expectation.pass(this.toString());
+                }
+
+                return true;
+            },
+
+            pass: function(message) {
+              sinon.assert.pass(message);
+            },
+            fail: function (message) {
+                var exception = new Error(message);
+                exception.name = "ExpectationError";
+
+                throw exception;
+            }
+        };
+    }());
+
+    if (commonJSModule) {
+        module.exports = mock;
+    } else {
+        sinon.mock = mock;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true*/
+/*global module, require, sinon*/
+/**
+ * Collections of stubs, spies and mocks.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+    var push = [].push;
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function getFakes(fakeCollection) {
+        if (!fakeCollection.fakes) {
+            fakeCollection.fakes = [];
+        }
+
+        return fakeCollection.fakes;
+    }
+
+    function each(fakeCollection, method) {
+        var fakes = getFakes(fakeCollection);
+
+        for (var i = 0, l = fakes.length; i < l; i += 1) {
+            if (typeof fakes[i][method] == "function") {
+                fakes[i][method]();
+            }
+        }
+    }
+
+    function compact(fakeCollection) {
+        var fakes = getFakes(fakeCollection);
+        var i = 0;
+        while (i < fakes.length) {
+          fakes.splice(i, 1);
+        }
+    }
+
+    var collection = {
+        verify: function resolve() {
+            each(this, "verify");
+        },
+
+        restore: function restore() {
+            each(this, "restore");
+            compact(this);
+        },
+
+        verifyAndRestore: function verifyAndRestore() {
+            var exception;
+
+            try {
+                this.verify();
+            } catch (e) {
+                exception = e;
+            }
+
+            this.restore();
+
+            if (exception) {
+                throw exception;
+            }
+        },
+
+        add: function add(fake) {
+            push.call(getFakes(this), fake);
+            return fake;
+        },
+
+        spy: function spy() {
+            return this.add(sinon.spy.apply(sinon, arguments));
+        },
+
+        stub: function stub(object, property, value) {
+            if (property) {
+                var original = object[property];
+
+                if (typeof original != "function") {
+                    if (!hasOwnProperty.call(object, property)) {
+                        throw new TypeError("Cannot stub non-existent own property " + property);
+                    }
+
+                    object[property] = value;
+
+                    return this.add({
+                        restore: function () {
+                            object[property] = original;
+                        }
+                    });
+                }
+            }
+            if (!property && !!object && typeof object == "object") {
+                var stubbedObj = sinon.stub.apply(sinon, arguments);
+
+                for (var prop in stubbedObj) {
+                    if (typeof stubbedObj[prop] === "function") {
+                        this.add(stubbedObj[prop]);
+                    }
+                }
+
+                return stubbedObj;
+            }
+
+            return this.add(sinon.stub.apply(sinon, arguments));
+        },
+
+        mock: function mock() {
+            return this.add(sinon.mock.apply(sinon, arguments));
+        },
+
+        inject: function inject(obj) {
+            var col = this;
+
+            obj.spy = function () {
+                return col.spy.apply(col, arguments);
+            };
+
+            obj.stub = function () {
+                return col.stub.apply(col, arguments);
+            };
+
+            obj.mock = function () {
+                return col.mock.apply(col, arguments);
+            };
+
+            return obj;
+        }
+    };
+
+    if (commonJSModule) {
+        module.exports = collection;
+    } else {
+        sinon.collection = collection;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/*jslint eqeqeq: false, plusplus: false, evil: true, onevar: false, browser: true, forin: false*/
+/*global module, require, window*/
+/**
+ * Fake timer API
+ * setTimeout
+ * setInterval
+ * clearTimeout
+ * clearInterval
+ * tick
+ * reset
+ * Date
+ *
+ * Inspired by jsUnitMockTimeOut from JsUnit
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+(function (global) {
+    var id = 1;
+
+    function addTimer(args, recurring) {
+        if (args.length === 0) {
+            throw new Error("Function requires at least 1 parameter");
+        }
+
+        var toId = id++;
+        var delay = args[1] || 0;
+
+        if (!this.timeouts) {
+            this.timeouts = {};
+        }
+
+        this.timeouts[toId] = {
+            id: toId,
+            func: args[0],
+            callAt: this.now + delay,
+            invokeArgs: Array.prototype.slice.call(args, 2)
+        };
+
+        if (recurring === true) {
+            this.timeouts[toId].interval = delay;
+        }
+
+        return toId;
+    }
+
+    function parseTime(str) {
+        if (!str) {
+            return 0;
+        }
+
+        var strings = str.split(":");
+        var l = strings.length, i = l;
+        var ms = 0, parsed;
+
+        if (l > 3 || !/^(\d\d:){0,2}\d\d?$/.test(str)) {
+            throw new Error("tick only understands numbers and 'h:m:s'");
+        }
+
+        while (i--) {
+            parsed = parseInt(strings[i], 10);
+
+            if (parsed >= 60) {
+                throw new Error("Invalid time " + str);
+            }
+
+            ms += parsed * Math.pow(60, (l - i - 1));
+        }
+
+        return ms * 1000;
+    }
+
+    function createObject(object) {
+        var newObject;
+
+        if (Object.create) {
+            newObject = Object.create(object);
+        } else {
+            var F = function () {};
+            F.prototype = object;
+            newObject = new F();
+        }
+
+        newObject.Date.clock = newObject;
+        return newObject;
+    }
+
+    sinon.clock = {
+        now: 0,
+
+        create: function create(now) {
+            var clock = createObject(this);
+
+            if (typeof now == "number") {
+                clock.now = now;
+            }
+
+            if (!!now && typeof now == "object") {
+                throw new TypeError("now should be milliseconds since UNIX epoch");
+            }
+
+            return clock;
+        },
+
+        setTimeout: function setTimeout(callback, timeout) {
+            return addTimer.call(this, arguments, false);
+        },
+
+        clearTimeout: function clearTimeout(timerId) {
+            if (!this.timeouts) {
+                this.timeouts = [];
+            }
+
+            if (timerId in this.timeouts) {
+                delete this.timeouts[timerId];
+            }
+        },
+
+        setInterval: function setInterval(callback, timeout) {
+            return addTimer.call(this, arguments, true);
+        },
+
+        clearInterval: function clearInterval(timerId) {
+            this.clearTimeout(timerId);
+        },
+
+        tick: function tick(ms) {
+            ms = typeof ms == "number" ? ms : parseTime(ms);
+            var tickFrom = this.now, tickTo = this.now + ms, previous = this.now;
+            var timer = this.firstTimerInRange(tickFrom, tickTo);
+
+            var firstException;
+            while (timer && tickFrom <= tickTo) {
+                if (this.timeouts[timer.id]) {
+                    tickFrom = this.now = timer.callAt;
+                    try {
+                      this.callTimer(timer);
+                    } catch (e) {
+                      firstException = firstException || e;
+                    }
+                }
+
+                timer = this.firstTimerInRange(previous, tickTo);
+                previous = tickFrom;
+            }
+
+            this.now = tickTo;
+
+            if (firstException) {
+              throw firstException;
+            }
+        },
+
+        firstTimerInRange: function (from, to) {
+            var timer, smallest, originalTimer;
+
+            for (var id in this.timeouts) {
+                if (this.timeouts.hasOwnProperty(id)) {
+                    if (this.timeouts[id].callAt < from || this.timeouts[id].callAt > to) {
+                        continue;
+                    }
+
+                    if (!smallest || this.timeouts[id].callAt < smallest) {
+                        originalTimer = this.timeouts[id];
+                        smallest = this.timeouts[id].callAt;
+
+                        timer = {
+                            func: this.timeouts[id].func,
+                            callAt: this.timeouts[id].callAt,
+                            interval: this.timeouts[id].interval,
+                            id: this.timeouts[id].id,
+                            invokeArgs: this.timeouts[id].invokeArgs
+                        };
+                    }
+                }
+            }
+
+            return timer || null;
+        },
+
+        callTimer: function (timer) {
+            if (typeof timer.interval == "number") {
+                this.timeouts[timer.id].callAt += timer.interval;
+            } else {
+                delete this.timeouts[timer.id];
+            }
+
+            try {
+                if (typeof timer.func == "function") {
+                    timer.func.apply(null, timer.invokeArgs);
+                } else {
+                    eval(timer.func);
+                }
+            } catch (e) {
+              var exception = e;
+            }
+
+            if (!this.timeouts[timer.id]) {
+                if (exception) {
+                  throw exception;
+                }
+                return;
+            }
+
+            if (exception) {
+              throw exception;
+            }
+        },
+
+        reset: function reset() {
+            this.timeouts = {};
+        },
+
+        Date: (function () {
+            var NativeDate = Date;
+
+            function ClockDate(year, month, date, hour, minute, second, ms) {
+                // Defensive and verbose to avoid potential harm in passing
+                // explicit undefined when user does not pass argument
+                switch (arguments.length) {
+                case 0:
+                    return new NativeDate(ClockDate.clock.now);
+                case 1:
+                    return new NativeDate(year);
+                case 2:
+                    return new NativeDate(year, month);
+                case 3:
+                    return new NativeDate(year, month, date);
+                case 4:
+                    return new NativeDate(year, month, date, hour);
+                case 5:
+                    return new NativeDate(year, month, date, hour, minute);
+                case 6:
+                    return new NativeDate(year, month, date, hour, minute, second);
+                default:
+                    return new NativeDate(year, month, date, hour, minute, second, ms);
+                }
+            }
+
+            return mirrorDateProperties(ClockDate, NativeDate);
+        }())
+    };
+
+    function mirrorDateProperties(target, source) {
+        if (source.now) {
+            target.now = function now() {
+                return target.clock.now;
+            };
+        } else {
+            delete target.now;
+        }
+
+        if (source.toSource) {
+            target.toSource = function toSource() {
+                return source.toSource();
+            };
+        } else {
+            delete target.toSource;
+        }
+
+        target.toString = function toString() {
+            return source.toString();
+        };
+
+        target.prototype = source.prototype;
+        target.parse = source.parse;
+        target.UTC = source.UTC;
+        target.prototype.toUTCString = source.prototype.toUTCString;
+        return target;
+    }
+
+    var methods = ["Date", "setTimeout", "setInterval",
+                   "clearTimeout", "clearInterval"];
+
+    function restore() {
+        var method;
+
+        for (var i = 0, l = this.methods.length; i < l; i++) {
+            method = this.methods[i];
+            if (global[method].hadOwnProperty) {
+                global[method] = this["_" + method];
+            } else {
+                delete global[method];
+            }
+        }
+
+        // Prevent multiple executions which will completely remove these props
+        this.methods = [];
+    }
+
+    function stubGlobal(method, clock) {
+        clock[method].hadOwnProperty = Object.prototype.hasOwnProperty.call(global, method);
+        clock["_" + method] = global[method];
+
+        if (method == "Date") {
+            var date = mirrorDateProperties(clock[method], global[method]);
+            global[method] = date;
+        } else {
+            global[method] = function () {
+                return clock[method].apply(clock, arguments);
+            };
+
+            for (var prop in clock[method]) {
+                if (clock[method].hasOwnProperty(prop)) {
+                    global[method][prop] = clock[method][prop];
+                }
+            }
+        }
+
+        global[method].clock = clock;
+    }
+
+    sinon.useFakeTimers = function useFakeTimers(now) {
+        var clock = sinon.clock.create(now);
+        clock.restore = restore;
+        clock.methods = Array.prototype.slice.call(arguments,
+                                                   typeof now == "number" ? 1 : 0);
+
+        if (clock.methods.length === 0) {
+            clock.methods = methods;
+        }
+
+        for (var i = 0, l = clock.methods.length; i < l; i++) {
+            stubGlobal(clock.methods[i], clock);
+        }
+
+        return clock;
+    };
+}(typeof global != "undefined" && typeof global !== "function" ? global : this));
+
+sinon.timers = {
+    setTimeout: setTimeout,
+    clearTimeout: clearTimeout,
+    setInterval: setInterval,
+    clearInterval: clearInterval,
+    Date: Date
+};
+
+if (typeof module == "object" && typeof require == "function") {
+    module.exports = sinon;
+}
+
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Minimal Event interface implementation
+ *
+ * Original implementation by Sven Fuchs: https://gist.github.com/995028
+ * Modifications and tests by Christian Johansen.
+ *
+ * @author Sven Fuchs (svenfuchs@artweb-design.de)
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2011 Sven Fuchs, Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    this.sinon = {};
+}
+
+(function () {
+    var push = [].push;
+
+    sinon.Event = function Event(type, bubbles, cancelable) {
+        this.initEvent(type, bubbles, cancelable);
+    };
+
+    sinon.Event.prototype = {
+        initEvent: function(type, bubbles, cancelable) {
+            this.type = type;
+            this.bubbles = bubbles;
+            this.cancelable = cancelable;
+        },
+
+        stopPropagation: function () {},
+
+        preventDefault: function () {
+            this.defaultPrevented = true;
+        }
+    };
+
+    sinon.EventTarget = {
+        addEventListener: function addEventListener(event, listener, useCapture) {
+            this.eventListeners = this.eventListeners || {};
+            this.eventListeners[event] = this.eventListeners[event] || [];
+            push.call(this.eventListeners[event], listener);
+        },
+
+        removeEventListener: function removeEventListener(event, listener, useCapture) {
+            var listeners = this.eventListeners && this.eventListeners[event] || [];
+
+            for (var i = 0, l = listeners.length; i < l; ++i) {
+                if (listeners[i] == listener) {
+                    return listeners.splice(i, 1);
+                }
+            }
+        },
+
+        dispatchEvent: function dispatchEvent(event) {
+            var type = event.type;
+            var listeners = this.eventListeners && this.eventListeners[type] || [];
+
+            for (var i = 0; i < listeners.length; i++) {
+                if (typeof listeners[i] == "function") {
+                    listeners[i].call(this, event);
+                } else {
+                    listeners[i].handleEvent(event);
+                }
+            }
+
+            return !!event.defaultPrevented;
+        }
+    };
+}());
+
+/**
+ * @depend ../../sinon.js
+ * @depend event.js
+ */
+/*jslint eqeqeq: false, onevar: false*/
+/*global sinon, module, require, ActiveXObject, XMLHttpRequest, DOMParser*/
+/**
+ * Fake XMLHttpRequest object
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    this.sinon = {};
+}
+sinon.xhr = { XMLHttpRequest: this.XMLHttpRequest };
+
+// wrapper for global
+(function(global) {
+    var xhr = sinon.xhr;
+    xhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
+    xhr.GlobalActiveXObject = global.ActiveXObject;
+    xhr.supportsActiveX = typeof xhr.GlobalActiveXObject != "undefined";
+    xhr.supportsXHR = typeof xhr.GlobalXMLHttpRequest != "undefined";
+    xhr.workingXHR = xhr.supportsXHR ? xhr.GlobalXMLHttpRequest : xhr.supportsActiveX
+                                     ? function() { return new xhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
+
+    /*jsl:ignore*/
+    var unsafeHeaders = {
+        "Accept-Charset": true,
+        "Accept-Encoding": true,
+        "Connection": true,
+        "Content-Length": true,
+        "Cookie": true,
+        "Cookie2": true,
+        "Content-Transfer-Encoding": true,
+        "Date": true,
+        "Expect": true,
+        "Host": true,
+        "Keep-Alive": true,
+        "Referer": true,
+        "TE": true,
+        "Trailer": true,
+        "Transfer-Encoding": true,
+        "Upgrade": true,
+        "User-Agent": true,
+        "Via": true
+    };
+    /*jsl:end*/
+
+    function FakeXMLHttpRequest() {
+        this.readyState = FakeXMLHttpRequest.UNSENT;
+        this.requestHeaders = {};
+        this.requestBody = null;
+        this.status = 0;
+        this.statusText = "";
+
+        if (typeof FakeXMLHttpRequest.onCreate == "function") {
+            FakeXMLHttpRequest.onCreate(this);
+        }
+    }
+
+    function verifyState(xhr) {
+        if (xhr.readyState !== FakeXMLHttpRequest.OPENED) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+
+        if (xhr.sendFlag) {
+            throw new Error("INVALID_STATE_ERR");
+        }
+    }
+
+    // filtering to enable a white-list version of Sinon FakeXhr,
+    // where whitelisted requests are passed through to real XHR
+    function each(collection, callback) {
+        if (!collection) return;
+        for (var i = 0, l = collection.length; i < l; i += 1) {
+            callback(collection[i]);
+        }
+    }
+    function some(collection, callback) {
+        for (var index = 0; index < collection.length; index++) {
+            if(callback(collection[index]) === true) return true;
+        };
+        return false;
+    }
+    // largest arity in XHR is 5 - XHR#open
+    var apply = function(obj,method,args) {
+        switch(args.length) {
+        case 0: return obj[method]();
+        case 1: return obj[method](args[0]);
+        case 2: return obj[method](args[0],args[1]);
+        case 3: return obj[method](args[0],args[1],args[2]);
+        case 4: return obj[method](args[0],args[1],args[2],args[3]);
+        case 5: return obj[method](args[0],args[1],args[2],args[3],args[4]);
+        };
+    };
+
+    FakeXMLHttpRequest.filters = [];
+    FakeXMLHttpRequest.addFilter = function(fn) {
+        this.filters.push(fn)
+    };
+    var IE6Re = /MSIE 6/;
+    FakeXMLHttpRequest.defake = function(fakeXhr,xhrArgs) {
+        var xhr = new sinon.xhr.workingXHR();
+        each(["open","setRequestHeader","send","abort","getResponseHeader",
+              "getAllResponseHeaders","addEventListener","overrideMimeType","removeEventListener"],
+             function(method) {
+                 fakeXhr[method] = function() {
+                   return apply(xhr,method,arguments);
+                 };
+             });
+
+        var copyAttrs = function(args) {
+            each(args, function(attr) {
+              try {
+                fakeXhr[attr] = xhr[attr]
+              } catch(e) {
+                if(!IE6Re.test(navigator.userAgent)) throw e;
+              }
+            });
+        };
+
+        var stateChange = function() {
+            fakeXhr.readyState = xhr.readyState;
+            if(xhr.readyState >= FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                copyAttrs(["status","statusText"]);
+            }
+            if(xhr.readyState >= FakeXMLHttpRequest.LOADING) {
+                copyAttrs(["responseText"]);
+            }
+            if(xhr.readyState === FakeXMLHttpRequest.DONE) {
+                copyAttrs(["responseXML"]);
+            }
+            if(fakeXhr.onreadystatechange) fakeXhr.onreadystatechange.call(fakeXhr);
+        };
+        if(xhr.addEventListener) {
+          for(var event in fakeXhr.eventListeners) {
+              if(fakeXhr.eventListeners.hasOwnProperty(event)) {
+                  each(fakeXhr.eventListeners[event],function(handler) {
+                      xhr.addEventListener(event, handler);
+                  });
+              }
+          }
+          xhr.addEventListener("readystatechange",stateChange);
+        } else {
+          xhr.onreadystatechange = stateChange;
+        }
+        apply(xhr,"open",xhrArgs);
+    };
+    FakeXMLHttpRequest.useFilters = false;
+
+    function verifyRequestSent(xhr) {
+        if (xhr.readyState == FakeXMLHttpRequest.DONE) {
+            throw new Error("Request done");
+        }
+    }
+
+    function verifyHeadersReceived(xhr) {
+        if (xhr.async && xhr.readyState != FakeXMLHttpRequest.HEADERS_RECEIVED) {
+            throw new Error("No headers received");
+        }
+    }
+
+    function verifyResponseBodyType(body) {
+        if (typeof body != "string") {
+            var error = new Error("Attempted to respond to fake XMLHttpRequest with " +
+                                 body + ", which is not a string.");
+            error.name = "InvalidBodyException";
+            throw error;
+        }
+    }
+
+    sinon.extend(FakeXMLHttpRequest.prototype, sinon.EventTarget, {
+        async: true,
+
+        open: function open(method, url, async, username, password) {
+            this.method = method;
+            this.url = url;
+            this.async = typeof async == "boolean" ? async : true;
+            this.username = username;
+            this.password = password;
+            this.responseText = null;
+            this.responseXML = null;
+            this.requestHeaders = {};
+            this.sendFlag = false;
+            if(sinon.FakeXMLHttpRequest.useFilters === true) {
+                var xhrArgs = arguments;
+                var defake = some(FakeXMLHttpRequest.filters,function(filter) {
+                    return filter.apply(this,xhrArgs)
+                });
+                if (defake) {
+                  return sinon.FakeXMLHttpRequest.defake(this,arguments);
+                }
+            }
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+        },
+
+        readyStateChange: function readyStateChange(state) {
+            this.readyState = state;
+
+            if (typeof this.onreadystatechange == "function") {
+                try {
+                    this.onreadystatechange();
+                } catch (e) {
+                    sinon.logError("Fake XHR onreadystatechange handler", e);
+                }
+            }
+
+            this.dispatchEvent(new sinon.Event("readystatechange"));
+        },
+
+        setRequestHeader: function setRequestHeader(header, value) {
+            verifyState(this);
+
+            if (unsafeHeaders[header] || /^(Sec-|Proxy-)/.test(header)) {
+                throw new Error("Refused to set unsafe header \"" + header + "\"");
+            }
+
+            if (this.requestHeaders[header]) {
+                this.requestHeaders[header] += "," + value;
+            } else {
+                this.requestHeaders[header] = value;
+            }
+        },
+
+        // Helps testing
+        setResponseHeaders: function setResponseHeaders(headers) {
+            this.responseHeaders = {};
+
+            for (var header in headers) {
+                if (headers.hasOwnProperty(header)) {
+                    this.responseHeaders[header] = headers[header];
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.HEADERS_RECEIVED);
+            }
+        },
+
+        // Currently treats ALL data as a DOMString (i.e. no Document)
+        send: function send(data) {
+            verifyState(this);
+
+            if (!/^(get|head)$/i.test(this.method)) {
+                if (this.requestHeaders["Content-Type"]) {
+                    var value = this.requestHeaders["Content-Type"].split(";");
+                    this.requestHeaders["Content-Type"] = value[0] + ";charset=utf-8";
+                } else {
+                    this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
+                }
+
+                this.requestBody = data;
+            }
+
+            this.errorFlag = false;
+            this.sendFlag = this.async;
+            this.readyStateChange(FakeXMLHttpRequest.OPENED);
+
+            if (typeof this.onSend == "function") {
+                this.onSend(this);
+            }
+        },
+
+        abort: function abort() {
+            this.aborted = true;
+            this.responseText = null;
+            this.errorFlag = true;
+            this.requestHeaders = {};
+
+            if (this.readyState > sinon.FakeXMLHttpRequest.UNSENT && this.sendFlag) {
+                this.readyStateChange(sinon.FakeXMLHttpRequest.DONE);
+                this.sendFlag = false;
+            }
+
+            this.readyState = sinon.FakeXMLHttpRequest.UNSENT;
+        },
+
+        getResponseHeader: function getResponseHeader(header) {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return null;
+            }
+
+            if (/^Set-Cookie2?$/i.test(header)) {
+                return null;
+            }
+
+            header = header.toLowerCase();
+
+            for (var h in this.responseHeaders) {
+                if (h.toLowerCase() == header) {
+                    return this.responseHeaders[h];
+                }
+            }
+
+            return null;
+        },
+
+        getAllResponseHeaders: function getAllResponseHeaders() {
+            if (this.readyState < FakeXMLHttpRequest.HEADERS_RECEIVED) {
+                return "";
+            }
+
+            var headers = "";
+
+            for (var header in this.responseHeaders) {
+                if (this.responseHeaders.hasOwnProperty(header) &&
+                    !/^Set-Cookie2?$/i.test(header)) {
+                    headers += header + ": " + this.responseHeaders[header] + "\r\n";
+                }
+            }
+
+            return headers;
+        },
+
+        setResponseBody: function setResponseBody(body) {
+            verifyRequestSent(this);
+            verifyHeadersReceived(this);
+            verifyResponseBodyType(body);
+
+            var chunkSize = this.chunkSize || 10;
+            var index = 0;
+            this.responseText = "";
+
+            do {
+                if (this.async) {
+                    this.readyStateChange(FakeXMLHttpRequest.LOADING);
+                }
+
+                this.responseText += body.substring(index, index + chunkSize);
+                index += chunkSize;
+            } while (index < body.length);
+
+            var type = this.getResponseHeader("Content-Type");
+
+            if (this.responseText &&
+                (!type || /(text\/xml)|(application\/xml)|(\+xml)/.test(type))) {
+                try {
+                    this.responseXML = FakeXMLHttpRequest.parseXML(this.responseText);
+                } catch (e) {
+                    // Unable to parse XML - no biggie
+                }
+            }
+
+            if (this.async) {
+                this.readyStateChange(FakeXMLHttpRequest.DONE);
+            } else {
+                this.readyState = FakeXMLHttpRequest.DONE;
+            }
+        },
+
+        respond: function respond(status, headers, body) {
+            this.setResponseHeaders(headers || {});
+            this.status = typeof status == "number" ? status : 200;
+            this.statusText = FakeXMLHttpRequest.statusCodes[this.status];
+            this.setResponseBody(body || "");
+        }
+    });
+
+    sinon.extend(FakeXMLHttpRequest, {
+        UNSENT: 0,
+        OPENED: 1,
+        HEADERS_RECEIVED: 2,
+        LOADING: 3,
+        DONE: 4
+    });
+
+    // Borrowed from JSpec
+    FakeXMLHttpRequest.parseXML = function parseXML(text) {
+        var xmlDoc;
+
+        if (typeof DOMParser != "undefined") {
+            var parser = new DOMParser();
+            xmlDoc = parser.parseFromString(text, "text/xml");
+        } else {
+            xmlDoc = new ActiveXObject("Microsoft.XMLDOM");
+            xmlDoc.async = "false";
+            xmlDoc.loadXML(text);
+        }
+
+        return xmlDoc;
+    };
+
+    FakeXMLHttpRequest.statusCodes = {
+        100: "Continue",
+        101: "Switching Protocols",
+        200: "OK",
+        201: "Created",
+        202: "Accepted",
+        203: "Non-Authoritative Information",
+        204: "No Content",
+        205: "Reset Content",
+        206: "Partial Content",
+        300: "Multiple Choice",
+        301: "Moved Permanently",
+        302: "Found",
+        303: "See Other",
+        304: "Not Modified",
+        305: "Use Proxy",
+        307: "Temporary Redirect",
+        400: "Bad Request",
+        401: "Unauthorized",
+        402: "Payment Required",
+        403: "Forbidden",
+        404: "Not Found",
+        405: "Method Not Allowed",
+        406: "Not Acceptable",
+        407: "Proxy Authentication Required",
+        408: "Request Timeout",
+        409: "Conflict",
+        410: "Gone",
+        411: "Length Required",
+        412: "Precondition Failed",
+        413: "Request Entity Too Large",
+        414: "Request-URI Too Long",
+        415: "Unsupported Media Type",
+        416: "Requested Range Not Satisfiable",
+        417: "Expectation Failed",
+        422: "Unprocessable Entity",
+        500: "Internal Server Error",
+        501: "Not Implemented",
+        502: "Bad Gateway",
+        503: "Service Unavailable",
+        504: "Gateway Timeout",
+        505: "HTTP Version Not Supported"
+    };
+
+    sinon.useFakeXMLHttpRequest = function () {
+        sinon.FakeXMLHttpRequest.restore = function restore(keepOnCreate) {
+            if (xhr.supportsXHR) {
+                global.XMLHttpRequest = xhr.GlobalXMLHttpRequest;
+            }
+
+            if (xhr.supportsActiveX) {
+                global.ActiveXObject = xhr.GlobalActiveXObject;
+            }
+
+            delete sinon.FakeXMLHttpRequest.restore;
+
+            if (keepOnCreate !== true) {
+                delete sinon.FakeXMLHttpRequest.onCreate;
+            }
+        };
+        if (xhr.supportsXHR) {
+            global.XMLHttpRequest = sinon.FakeXMLHttpRequest;
+        }
+
+        if (xhr.supportsActiveX) {
+            global.ActiveXObject = function ActiveXObject(objId) {
+                if (objId == "Microsoft.XMLHTTP" || /^Msxml2\.XMLHTTP/i.test(objId)) {
+
+                    return new sinon.FakeXMLHttpRequest();
+                }
+
+                return new xhr.GlobalActiveXObject(objId);
+            };
+        }
+
+        return sinon.FakeXMLHttpRequest;
+    };
+
+    sinon.FakeXMLHttpRequest = FakeXMLHttpRequest;
+})(this);
+
+if (typeof module == "object" && typeof require == "function") {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_xml_http_request.js
+ */
+/*jslint eqeqeq: false, onevar: false, regexp: false, plusplus: false*/
+/*global module, require, window*/
+/**
+ * The Sinon "server" mimics a web server that receives requests from
+ * sinon.FakeXMLHttpRequest and provides an API to respond to those requests,
+ * both synchronously and asynchronously. To respond synchronuously, canned
+ * answers have to be provided upfront.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+if (typeof sinon == "undefined") {
+    var sinon = {};
+}
+
+sinon.fakeServer = (function () {
+    var push = [].push;
+    function F() {}
+
+    function create(proto) {
+        F.prototype = proto;
+        return new F();
+    }
+
+    function responseArray(handler) {
+        var response = handler;
+
+        if (Object.prototype.toString.call(handler) != "[object Array]") {
+            response = [200, {}, handler];
+        }
+
+        if (typeof response[2] != "string") {
+            throw new TypeError("Fake server response body should be string, but was " +
+                                typeof response[2]);
+        }
+
+        return response;
+    }
+
+    var wloc = typeof window !== "undefined" ? window.location : {};
+    var rCurrLoc = new RegExp("^" + wloc.protocol + "//" + wloc.host);
+
+    function matchOne(response, reqMethod, reqUrl) {
+        var rmeth = response.method;
+        var matchMethod = !rmeth || rmeth.toLowerCase() == reqMethod.toLowerCase();
+        var url = response.url;
+        var matchUrl = !url || url == reqUrl || (typeof url.test == "function" && url.test(reqUrl));
+
+        return matchMethod && matchUrl;
+    }
+
+    function match(response, request) {
+        var requestMethod = this.getHTTPMethod(request);
+        var requestUrl = request.url;
+
+        if (!/^https?:\/\//.test(requestUrl) || rCurrLoc.test(requestUrl)) {
+            requestUrl = requestUrl.replace(rCurrLoc, "");
+        }
+
+        if (matchOne(response, this.getHTTPMethod(request), requestUrl)) {
+            if (typeof response.response == "function") {
+                var ru = response.url;
+                var args = [request].concat(!ru ? [] : requestUrl.match(ru).slice(1));
+                return response.response.apply(response, args);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    return {
+        create: function () {
+            var server = create(this);
+            this.xhr = sinon.useFakeXMLHttpRequest();
+            server.requests = [];
+
+            this.xhr.onCreate = function (xhrObj) {
+                server.addRequest(xhrObj);
+            };
+
+            return server;
+        },
+
+        addRequest: function addRequest(xhrObj) {
+            var server = this;
+            push.call(this.requests, xhrObj);
+
+            xhrObj.onSend = function () {
+                server.handleRequest(this);
+            };
+
+            if (this.autoRespond && !this.responding) {
+                setTimeout(function () {
+                    server.responding = false;
+                    server.respond();
+                }, this.autoRespondAfter || 10);
+
+                this.responding = true;
+            }
+        },
+
+        getHTTPMethod: function getHTTPMethod(request) {
+            if (this.fakeHTTPMethods && /post/i.test(request.method)) {
+                var matches = (request.requestBody || "").match(/_method=([^\b;]+)/);
+                return !!matches ? matches[1] : request.method;
+            }
+
+            return request.method;
+        },
+
+        handleRequest: function handleRequest(xhr) {
+            if (xhr.async) {
+                if (!this.queue) {
+                    this.queue = [];
+                }
+
+                push.call(this.queue, xhr);
+            } else {
+                this.processRequest(xhr);
+            }
+        },
+
+        respondWith: function respondWith(method, url, body) {
+            if (arguments.length == 1 && typeof method != "function") {
+                this.response = responseArray(method);
+                return;
+            }
+
+            if (!this.responses) { this.responses = []; }
+
+            if (arguments.length == 1) {
+                body = method;
+                url = method = null;
+            }
+
+            if (arguments.length == 2) {
+                body = url;
+                url = method;
+                method = null;
+            }
+
+            push.call(this.responses, {
+                method: method,
+                url: url,
+                response: typeof body == "function" ? body : responseArray(body)
+            });
+        },
+
+        respond: function respond() {
+            if (arguments.length > 0) this.respondWith.apply(this, arguments);
+            var queue = this.queue || [];
+            var request;
+
+            while(request = queue.shift()) {
+                this.processRequest(request);
+            }
+        },
+
+        processRequest: function processRequest(request) {
+            try {
+                if (request.aborted) {
+                    return;
+                }
+
+                var response = this.response || [404, {}, ""];
+
+                if (this.responses) {
+                    for (var i = 0, l = this.responses.length; i < l; i++) {
+                        if (match.call(this, this.responses[i], request)) {
+                            response = this.responses[i].response;
+                            break;
+                        }
+                    }
+                }
+
+                if (request.readyState != 4) {
+                    request.respond(response[0], response[1], response[2]);
+                }
+            } catch (e) {
+                sinon.logError("Fake server request processing", e);
+            }
+        },
+
+        restore: function restore() {
+            return this.xhr.restore && this.xhr.restore.apply(this.xhr, arguments);
+        }
+    };
+}());
+
+if (typeof module == "object" && typeof require == "function") {
+    module.exports = sinon;
+}
+
+/**
+ * @depend fake_server.js
+ * @depend fake_timers.js
+ */
+/*jslint browser: true, eqeqeq: false, onevar: false*/
+/*global sinon*/
+/**
+ * Add-on for sinon.fakeServer that automatically handles a fake timer along with
+ * the FakeXMLHttpRequest. The direct inspiration for this add-on is jQuery
+ * 1.3.x, which does not use xhr object's onreadystatehandler at all - instead,
+ * it polls the object for completion with setInterval. Dispite the direct
+ * motivation, there is nothing jQuery-specific in this file, so it can be used
+ * in any environment where the ajax implementation depends on setInterval or
+ * setTimeout.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function () {
+    function Server() {}
+    Server.prototype = sinon.fakeServer;
+
+    sinon.fakeServerWithClock = new Server();
+
+    sinon.fakeServerWithClock.addRequest = function addRequest(xhr) {
+        if (xhr.async) {
+            if (typeof setTimeout.clock == "object") {
+                this.clock = setTimeout.clock;
+            } else {
+                this.clock = sinon.useFakeTimers();
+                this.resetClock = true;
+            }
+
+            if (!this.longestTimeout) {
+                var clockSetTimeout = this.clock.setTimeout;
+                var clockSetInterval = this.clock.setInterval;
+                var server = this;
+
+                this.clock.setTimeout = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetTimeout.apply(this, arguments);
+                };
+
+                this.clock.setInterval = function (fn, timeout) {
+                    server.longestTimeout = Math.max(timeout, server.longestTimeout || 0);
+
+                    return clockSetInterval.apply(this, arguments);
+                };
+            }
+        }
+
+        return sinon.fakeServer.addRequest.call(this, xhr);
+    };
+
+    sinon.fakeServerWithClock.respond = function respond() {
+        var returnVal = sinon.fakeServer.respond.apply(this, arguments);
+
+        if (this.clock) {
+            this.clock.tick(this.longestTimeout || 0);
+            this.longestTimeout = 0;
+
+            if (this.resetClock) {
+                this.clock.restore();
+                this.resetClock = false;
+            }
+        }
+
+        return returnVal;
+    };
+
+    sinon.fakeServerWithClock.restore = function restore() {
+        if (this.clock) {
+            this.clock.restore();
+        }
+
+        return sinon.fakeServer.restore.apply(this, arguments);
+    };
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend collection.js
+ * @depend util/fake_timers.js
+ * @depend util/fake_server_with_clock.js
+ */
+/*jslint eqeqeq: false, onevar: false, plusplus: false*/
+/*global require, module*/
+/**
+ * Manages fake collections as well as fake utilities such as Sinon's
+ * timers and fake XHR implementation in one convenient object.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+if (typeof module == "object" && typeof require == "function") {
+    var sinon = require("../sinon");
+    sinon.extend(sinon, require("./util/fake_timers"));
+}
+
+(function () {
+    var push = [].push;
+
+    function exposeValue(sandbox, config, key, value) {
+        if (!value) {
+            return;
+        }
+
+        if (config.injectInto) {
+            config.injectInto[key] = value;
+        } else {
+            push.call(sandbox.args, value);
+        }
+    }
+
+    function prepareSandboxFromConfig(config) {
+        var sandbox = sinon.create(sinon.sandbox);
+
+        if (config.useFakeServer) {
+            if (typeof config.useFakeServer == "object") {
+                sandbox.serverPrototype = config.useFakeServer;
+            }
+
+            sandbox.useFakeServer();
+        }
+
+        if (config.useFakeTimers) {
+            if (typeof config.useFakeTimers == "object") {
+                sandbox.useFakeTimers.apply(sandbox, config.useFakeTimers);
+            } else {
+                sandbox.useFakeTimers();
+            }
+        }
+
+        return sandbox;
+    }
+
+    sinon.sandbox = sinon.extend(sinon.create(sinon.collection), {
+        useFakeTimers: function useFakeTimers() {
+            this.clock = sinon.useFakeTimers.apply(sinon, arguments);
+
+            return this.add(this.clock);
+        },
+
+        serverPrototype: sinon.fakeServer,
+
+        useFakeServer: function useFakeServer() {
+            var proto = this.serverPrototype || sinon.fakeServer;
+
+            if (!proto || !proto.create) {
+                return null;
+            }
+
+            this.server = proto.create();
+            return this.add(this.server);
+        },
+
+        inject: function (obj) {
+            sinon.collection.inject.call(this, obj);
+
+            if (this.clock) {
+                obj.clock = this.clock;
+            }
+
+            if (this.server) {
+                obj.server = this.server;
+                obj.requests = this.server.requests;
+            }
+
+            return obj;
+        },
+
+        create: function (config) {
+            if (!config) {
+                return sinon.create(sinon.sandbox);
+            }
+
+            var sandbox = prepareSandboxFromConfig(config);
+            sandbox.args = sandbox.args || [];
+            var prop, value, exposed = sandbox.inject({});
+
+            if (config.properties) {
+                for (var i = 0, l = config.properties.length; i < l; i++) {
+                    prop = config.properties[i];
+                    value = exposed[prop] || prop == "sandbox" && sandbox;
+                    exposeValue(sandbox, config, prop, value);
+                }
+            } else {
+                exposeValue(sandbox, config, "sandbox", value);
+            }
+
+            return sandbox;
+        }
+    });
+
+    sinon.sandbox.useFakeXMLHttpRequest = sinon.sandbox.useFakeServer;
+
+    if (typeof module == "object" && typeof require == "function") {
+        module.exports = sinon.sandbox;
+    }
+}());
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ * @depend mock.js
+ * @depend sandbox.js
+ */
+/*jslint eqeqeq: false, onevar: false, forin: true, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Test function, sandboxes fakes
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function test(callback) {
+        var type = typeof callback;
+
+        if (type != "function") {
+            throw new TypeError("sinon.test needs to wrap a test function, got " + type);
+        }
+
+        return function () {
+            var config = sinon.getConfig(sinon.config);
+            config.injectInto = config.injectIntoThis && this || config.injectInto;
+            var sandbox = sinon.sandbox.create(config);
+            var exception, result;
+            var args = Array.prototype.slice.call(arguments).concat(sandbox.args);
+
+            try {
+                result = callback.apply(this, args);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (typeof exception !== "undefined") {
+                sandbox.restore();
+                throw exception;
+            }
+            else {
+                sandbox.verifyAndRestore();
+            }
+
+            return result;
+        };
+    }
+
+    test.config = {
+        injectIntoThis: true,
+        injectInto: null,
+        properties: ["spy", "stub", "mock", "clock", "server", "requests"],
+        useFakeTimers: true,
+        useFakeServer: true
+    };
+
+    if (commonJSModule) {
+        module.exports = test;
+    } else {
+        sinon.test = test;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend test.js
+ */
+/*jslint eqeqeq: false, onevar: false, eqeqeq: false*/
+/*global module, require, sinon*/
+/**
+ * Test case, sandboxes all test functions
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon || !Object.prototype.hasOwnProperty) {
+        return;
+    }
+
+    function createTest(property, setUp, tearDown) {
+        return function () {
+            if (setUp) {
+                setUp.apply(this, arguments);
+            }
+
+            var exception, result;
+
+            try {
+                result = property.apply(this, arguments);
+            } catch (e) {
+                exception = e;
+            }
+
+            if (tearDown) {
+                tearDown.apply(this, arguments);
+            }
+
+            if (exception) {
+                throw exception;
+            }
+
+            return result;
+        };
+    }
+
+    function testCase(tests, prefix) {
+        /*jsl:ignore*/
+        if (!tests || typeof tests != "object") {
+            throw new TypeError("sinon.testCase needs an object with test functions");
+        }
+        /*jsl:end*/
+
+        prefix = prefix || "test";
+        var rPrefix = new RegExp("^" + prefix);
+        var methods = {}, testName, property, method;
+        var setUp = tests.setUp;
+        var tearDown = tests.tearDown;
+
+        for (testName in tests) {
+            if (tests.hasOwnProperty(testName)) {
+                property = tests[testName];
+
+                if (/^(setUp|tearDown)$/.test(testName)) {
+                    continue;
+                }
+
+                if (typeof property == "function" && rPrefix.test(testName)) {
+                    method = property;
+
+                    if (setUp || tearDown) {
+                        method = createTest(property, setUp, tearDown);
+                    }
+
+                    methods[testName] = sinon.test(method);
+                } else {
+                    methods[testName] = tests[testName];
+                }
+            }
+        }
+
+        return methods;
+    }
+
+    if (commonJSModule) {
+        module.exports = testCase;
+    } else {
+        sinon.testCase = testCase;
+    }
+}(typeof sinon == "object" && sinon || null));
+
+/**
+ * @depend ../sinon.js
+ * @depend stub.js
+ */
+/*jslint eqeqeq: false, onevar: false, nomen: false, plusplus: false*/
+/*global module, require, sinon*/
+/**
+ * Assertions matching the test spy retrieval interface.
+ *
+ * @author Christian Johansen (christian@cjohansen.no)
+ * @license BSD
+ *
+ * Copyright (c) 2010-2011 Christian Johansen
+ */
+
+(function (sinon, global) {
+    var commonJSModule = typeof module == "object" && typeof require == "function";
+    var slice = Array.prototype.slice;
+    var assert;
+
+    if (!sinon && commonJSModule) {
+        sinon = require("../sinon");
+    }
+
+    if (!sinon) {
+        return;
+    }
+
+    function verifyIsStub() {
+        var method;
+
+        for (var i = 0, l = arguments.length; i < l; ++i) {
+            method = arguments[i];
+
+            if (!method) {
+                assert.fail("fake is not a spy");
+            }
+
+            if (typeof method != "function") {
+                assert.fail(method + " is not a function");
+            }
+
+            if (typeof method.getCall != "function") {
+                assert.fail(method + " is not stubbed");
+            }
+        }
+    }
+
+    function failAssertion(object, msg) {
+        object = object || global;
+        var failMethod = object.fail || assert.fail;
+        failMethod.call(object, msg);
+    }
+
+    function mirrorPropAsAssertion(name, method, message) {
+        if (arguments.length == 2) {
+            message = method;
+            method = name;
+        }
+
+        assert[name] = function (fake) {
+            verifyIsStub(fake);
+
+            var args = slice.call(arguments, 1);
+            var failed = false;
+
+            if (typeof method == "function") {
+                failed = !method(fake);
+            } else {
+                failed = typeof fake[method] == "function" ?
+                    !fake[method].apply(fake, args) : !fake[method];
+            }
+
+            if (failed) {
+                failAssertion(this, fake.printf.apply(fake, [message].concat(args)));
+            } else {
+                assert.pass(name);
+            }
+        };
+    }
+
+    function exposedName(prefix, prop) {
+        return !prefix || /^fail/.test(prop) ? prop :
+            prefix + prop.slice(0, 1).toUpperCase() + prop.slice(1);
+    };
+
+    assert = {
+        failException: "AssertError",
+
+        fail: function fail(message) {
+            var error = new Error(message);
+            error.name = this.failException || assert.failException;
+
+            throw error;
+        },
+
+        pass: function pass(assertion) {},
+
+        callOrder: function assertCallOrder() {
+            verifyIsStub.apply(null, arguments);
+            var expected = "", actual = "";
+
+            if (!sinon.calledInOrder(arguments)) {
+                try {
+                    expected = [].join.call(arguments, ", ");
+                    actual = sinon.orderByFirstCall(slice.call(arguments)).join(", ");
+                } catch (e) {
+                    // If this fails, we'll just fall back to the blank string
+                }
+
+                failAssertion(this, "expected " + expected + " to be " +
+                              "called in order but were called as " + actual);
+            } else {
+                assert.pass("callOrder");
+            }
+        },
+
+        callCount: function assertCallCount(method, count) {
+            verifyIsStub(method);
+
+            if (method.callCount != count) {
+                var msg = "expected %n to be called " + sinon.timesInWords(count) +
+                    " but was called %c%C";
+                failAssertion(this, method.printf(msg));
+            } else {
+                assert.pass("callCount");
+            }
+        },
+
+        expose: function expose(target, options) {
+            if (!target) {
+                throw new TypeError("target is null or undefined");
+            }
+
+            var o = options || {};
+            var prefix = typeof o.prefix == "undefined" && "assert" || o.prefix;
+            var includeFail = typeof o.includeFail == "undefined" || !!o.includeFail;
+
+            for (var method in this) {
+                if (method != "export" && (includeFail || !/^(fail)/.test(method))) {
+                    target[exposedName(prefix, method)] = this[method];
+                }
+            }
+
+            return target;
+        }
+    };
+
+    mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
+    mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
+                          "expected %n to not have been called but was called %c%C");
+    mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
+    mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
+    mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");
+    mirrorPropAsAssertion("calledOn", "expected %n to be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("alwaysCalledOn", "expected %n to always be called with %1 as this but was called with %t");
+    mirrorPropAsAssertion("calledWithNew", "expected %n to be called with new");
+    mirrorPropAsAssertion("alwaysCalledWithNew", "expected %n to always be called with new");
+    mirrorPropAsAssertion("calledWith", "expected %n to be called with arguments %*%C");
+    mirrorPropAsAssertion("calledWithMatch", "expected %n to be called with match %*%C");
+    mirrorPropAsAssertion("alwaysCalledWith", "expected %n to always be called with arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithMatch", "expected %n to always be called with match %*%C");
+    mirrorPropAsAssertion("calledWithExactly", "expected %n to be called with exact arguments %*%C");
+    mirrorPropAsAssertion("alwaysCalledWithExactly", "expected %n to always be called with exact arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWith", "expected %n to never be called with arguments %*%C");
+    mirrorPropAsAssertion("neverCalledWithMatch", "expected %n to never be called with match %*%C");
+    mirrorPropAsAssertion("threw", "%n did not throw exception%C");
+    mirrorPropAsAssertion("alwaysThrew", "%n did not always throw exception%C");
+
+    if (commonJSModule) {
+        module.exports = assert;
+    } else {
+        sinon.assert = assert;
+    }
+}(typeof sinon == "object" && sinon || null, typeof window != "undefined" ? window : global));
+
+return sinon;}.call(typeof window != 'undefined' && window || {}));
diff --git a/test/views/app_test.coffee b/test/views/app_test.coffee
new file mode 100644
index 00000000..5c950daa
--- /dev/null
+++ b/test/views/app_test.coffee
@@ -0,0 +1,8 @@
+Formbuilder = window.Formbuilder
+
+describe 'Formbuilder', ->
+    beforeEach ->
+        @view = new Formbuilder()
+
+    it 'should exist', ->
+        expect(@view).to.be.ok