reduced some complexity
Merge branch 'oauth2provider' of github.com:coolaj86/waste into oauth2provider