diff --git a/config/passport.js b/config/passport.js
index 975e9db301..f4875f1bfd 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -5,7 +5,7 @@ var passport = require('passport'),
     GitHubStrategy = require('passport-github').Strategy,
     GoogleStrategy = require('passport-google-oauth').OAuth2Strategy,
     User = require('../models/User'),
-    config = require('./config.json');
+    config = require('./config');
 
 passport.serializeUser(function(user, done) {
   done(null, user.id);
@@ -19,135 +19,78 @@ passport.deserializeUser(function(id, done) {
 
 passport.use(new LocalStrategy(function(username, password, done) {
   User.findOne({ username: username }, function(err, user) {
-    if (err) return done(err);
-    if (!user) { return done(null, false, { message: 'Unknown user ' + username }); }
+    if (!user) return done(null, false, { message: 'No match found for user: ' + username });
     user.comparePassword(password, function(err, isMatch) {
-      if (err) return done(err);
       if(isMatch) {
         return done(null, user);
       } else {
-        return done(null, false, { message: 'Invalid password' });
+        return done(null, false, { message: 'Your username or password is incorrect' });
       }
     });
   });
 }));
 
-// FACEBOOK OAUTH2 LOGIN
-passport.use(new FacebookStrategy({
-    clientID: config.facebook.clientId,
-    clientSecret: config.facebook.clientSecret,
-    callbackURL: config.facebook.callbackUrl || "http://localhost:8000/auth/facebook/callback"
-  },
-  function (accessToken, refreshToken, profile, done) {
-    User.findOne({ facebook: profile.id }, function(err, existingUser) {
-      if (err) return done(err);
-
-      if (existingUser) {
-        return done(null, existingUser);
-      }
-
-      var user = new User({
-        facebook: profile.id
-      });
-      user.profile.name = profile.displayName;
-      user.profile.email = profile._json.email;
-      user.profile.gender = profile._json.gender;
-      user.profile.picture = 'https://graph.facebook.com/' + profile.id + '/picture?type=normal';
-
-      user.save(function(err) {
-        done(err, user);
-      });
+passport.use(new FacebookStrategy(config.facebook, function (accessToken, refreshToken, profile, done) {
+  User.findOne({ facebook: profile.id }, function(err, existingUser) {
+    if (existingUser) return done(null, existingUser);
+    var user = new User();
+    user.facebook = profile.id;
+    user.profile.name = profile.displayName;
+    user.profile.email = profile._json.email;
+    user.profile.gender = profile._json.gender;
+    user.profile.picture = 'https://graph.facebook.com/' + profile.id + '/picture?type=normal';
+    user.save(function(err) {
+      done(err, user);
     });
-  }
-));
+  });
+}));
 
-// GITHUB OAUTH2 LOGIN
-passport.use(new GitHubStrategy({
-    clientID: config.github.clientId,
-    clientSecret: config.github.clientSecret,
-    callbackURL: config.github.callbackUrl
-  },
-  function(accessToken, refreshToken, profile, done) {
-    User.findOne({ github: profile.id }, function(err, existingUser) {
-      if (err) return done(err);
-
-      if (existingUser) {
-        return done(null, existingUser);
-      }
-      console.log(profile)
-      var user = new User({
-        github: profile.id
-      });
-      user.profile.name = profile.displayName;
-      user.profile.email = profile._json.email;
-      user.profile.picture = profile._json.avatar_url;
-      user.profile.location = profile._json.location;
-      user.profile.website = profile._json.blog;
-
-      user.save(function(err) {
-        done(err, user);
-      });
+passport.use(new GitHubStrategy(config.github, function(accessToken, refreshToken, profile, done) {
+  User.findOne({ github: profile.id }, function(err, existingUser) {
+    if (existingUser) return done(null, existingUser);
+    var user = new User();
+    user.github = profile.id;
+    user.profile.name = profile.displayName;
+    user.profile.email = profile._json.email;
+    user.profile.picture = profile._json.avatar_url;
+    user.profile.location = profile._json.location;
+    user.profile.website = profile._json.blog;
+    user.save(function(err) {
+      done(err, user);
     });
-  }
-));
+  });
+}));
 
-// TWITTER OAUTH2 LOGIN
-passport.use(new TwitterStrategy({
-    consumerKey: config.twitter.clientId,
-    consumerSecret: config.twitter.clientSecret,
-    callbackURL: '/auth/twitter/callback'
-  },
-  function(accessToken, tokenSecret, profile, done) {
-    User.findOne({ twitter: profile.id }, function(err, existingUser) {
-      if (err) return done(err);
-
-      if (existingUser) {
-        return done(null, existingUser);
-      }
-
-      var user = new User({
-        twitter: profile.id
-      });
-      user.tokens.twitter = accessToken;
-      user.profile.name = profile.displayName;
-      user.profile.location = profile._json.location;
-      user.profile.picture = profile._json.profile_image_url;
-
-      user.save(function(err) {
-        done(err, user);
-      });
+passport.use(new TwitterStrategy(config.twitter, function(accessToken, tokenSecret, profile, done) {
+  User.findOne({ twitter: profile.id }, function(err, existingUser) {
+    if (existingUser) return done(null, existingUser);
+    var user = new User();
+    user.twitter = profile.id;
+    user.tokens.twitter = accessToken;
+    user.profile.name = profile.displayName;
+    user.profile.location = profile._json.location;
+    user.profile.picture = profile._json.profile_image_url;
+    user.save(function(err) {
+      done(err, user);
     });
-  }
-));
+  });
+}));
 
-// GOOGLE OAUTH2 LOGIN
-passport.use(new GoogleStrategy({
-    clientID: config.google.clientId,
-    clientSecret: config.google.clientSecret,
-    callbackURL: config.google.callbackUrl
-  },
-  function(accessToken, refreshToken, profile, done) {
-    User.findOne({ google: profile.id }, function(err, existingUser) {
-      if (err) done(err);
-
-      if (existingUser) {
-        return done(null, existingUser);
-      }
-      var user = new User({
-        google: profile.id
-      });
-      user.tokens.google = accessToken;
-      user.profile.name = profile.displayName;
-      user.profile.email = profile._json.email;
-      user.profile.gender = profile._json.gender;
-      user.profile.picture = profile._json.picture;
-
-      user.save(function(err) {
-        done(err, user);
-      });
+passport.use(new GoogleStrategy(config.google, function(accessToken, refreshToken, profile, done) {
+  User.findOne({ google: profile.id }, function(err, existingUser) {
+    if (existingUser) return done(null, existingUser);
+    var user = new User();
+    user.google = profile.id;
+    user.tokens.google = accessToken;
+    user.profile.name = profile.displayName;
+    user.profile.email = profile._json.email;
+    user.profile.gender = profile._json.gender;
+    user.profile.picture = profile._json.picture;
+    user.save(function(err) {
+      done(err, user);
     });
-  }
-));
+  });
+}));
 
 // Simple route middleware to ensure user is authenticated.  Otherwise send to login page.
 exports.ensureAuthenticated = function ensureAuthenticated(req, res, next) {