commented out breaking part of code and added timeout to test, we need to figure out how not to pollute localStorage
stash
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