failure url should be the same as success
properly handle scope upgrades
Merge branch 'master' of github.com:coolaj86/waste