WIP
Merge branch 'master' of https://github.com/usabilitydynamics/abstract

Conflicts:
	lib/abstract.js
	test/core.js
	test/modeling.js