refactor(email): remove email parameter from config (#2400) r=@vladikoff,@rfk

Removes email extra parameter from config

config/index.js

@@ -541,12 +541,6 @@ var conf = convict({
       env: 'OAUTH_KEEPALIVE',
       default: false
     },
-    extra: {
-      email: {
-        doc: 'Temporary extra parameter to prevent request recursion',
-        default: false
-      }
-    },
     clientIds: {
       doc: 'Mappings from client id to service name: { "id1": "name-1", "id2": "name-2" }',
       format: Object,

test/local/server.js

@@ -523,10 +523,7 @@ function getConfig () {
     oauth: {
       clientIds: {},
       url: 'http://localhost:9010',
-      keepAlive: false,
-      extra: {
-        email: false
-      }
+      keepAlive: false
     },
     env: 'prod',
     memcached: {