Param naming tweak. Ordering tweak.
Fix exception message now that we only have one queue.
Merge branch 'master' of https://github.com/JakeWharton/scalpel