Waiting for Bluebird #36
Fix some unhandled error warnings from bluebird
Use new .timeout() and .delay() from bluebird #37
Cleanup code and docs
Merge branch 'develop'