Fixed loading tests
Merge branch 'master' of github.com:bendr/bender

Conflicts:
	html/bender.js
Consolidating tests