Merge pull request #3 from DukeBaird/develop

Develop
Fixed bluebird in package.json
Merge pull request #4 from DukeBaird/master

Merge hotfix back into develop