unit/test-api.js commented out tests are reactivated, update is fixed
commented test-usage.js tests reactivated
Merge pull request #32 from amida-tech/afsin

#31 fix
Merge branch 'master' into match-models

Conflicts:
	test/unit/test-api.js