Fix a few issues runing Jasmine tests
Merge anders' fixes
More tweaking
Merge branch 'master' into brains

Conflicts:
	js/script.js
All tests green - ready to run