(#218) - fix _conflicts not in returned results

@jrhicks Squashed your commits and fixed the commit message, also added the http _conflicts param so the test would pass in http as well.
`cleanup` won't be run if sth throws somewhere. [Finally](https://github.com/kriskowal/q/wiki/API-Reference#promisefinallycallback) has some more meaning. Especially, you don't want `then(cleanup, cleanup)` because it will catch errors that shouldn't be caught.