replace es6-promise to Q
Merge pull request #39 from fanatid/promise