Standardize callbacks.
Merge branch 'dev' into standardize-callback

Conflicts:
	lib/adaptor.js
	lib/driver.js
Merge pull request #18 from hybridgroup/standardize-callback

Standardize callbacks.