upgrade promise
1.1.4
Merge branch 'master' of github.com:nathan7/then-queue

Conflicts:
	package.json