Merge branch 'oauth2provider'
Merge branch 'contacts' of github.com:coolaj86/waste
minor cleanup
handle /session/ and /oauth/:provider routes before handling oauth2
Merge branch 'master' of github.com:coolaj86/waste into contacts