Standardize callbacks(err, data)
Merge branch 'dev' into standardize-callback

Conflicts:
	lib/adaptor.js
Fix tests for new callback(err, data) formata.
Merge pull request #5 from hybridgroup/standardize-callback

Standardize callbacks(err, data)