Standardize callback and cleanup code.
Merge branch 'dev' into standardize-callback

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

Standardize callback and cleanup code.