Use ES6 style promises instead of callbacks
Use rsvp instead of es6-promise (allows some features not in ES6)
Switch from RSVP to Bluebird, which also supports Promises/A+
Merge branch 'promises' into koa

Conflicts:
	package.json