commented out breaking part of code and added timeout to test, we need to figure out how not to pollute localStorage
stash
fixes WEB-452 replaces jquery deferreds with a lib thatll work w/o being in browser
fixed router tests by keping localstorage from happening
merge
Merge branch 'RC1/master' of github.com:motherjones/smokejs into RC1/better_promise

Conflicts:
	js/api.js
	package.json
	test/api.js
fix lingering uses of when and state for jquery promises, expose mock server issue
clear localstorage w/ tests before doing tests
added api stuff and stashed
added special sinon friendly fork of requests
Merge branch 'RC1/master' of github.com:motherjones/smokejs into RC1/better_promise

Conflicts:
	js/api.js
	package.json
fix typo
fix the things i didnt know were broken when tests didnt work
Merge pull request #4 from motherjones/RC1/better_promise

Rc1/better promise
Merge branch 'RC1/master' of github.com:motherjones/smokejs into RC1/basic_api

Conflicts:
	js/api.js
	package.json
	test/api.js