diff --git a/app.js b/app.js
index 435d9b8ec7..fe9c96a0a6 100755
--- a/app.js
+++ b/app.js
@@ -14,20 +14,20 @@ var api = require('./controllers/api');
 var contact = require('./controllers/contact');
 
 // App Configuration (API Keys, Database URI)
-var config = require('./config/config');
+var secrets = require('./config/secrets');
 var passportConf = require('./config/passport');
 
 // Connect to MongoDB on a separate domain
 var dbDomain = domain.create();
 dbDomain.run(function() {
-  mongoose.connect(config.db);
+  mongoose.connect(secrets.db);
 });
 
 // Graceful error handling for MongoDB
 dbDomain.on('error', function(err) {
   console.error(err.message);
   setTimeout(function() {
-    mongoose.connect(config.db);
+    mongoose.connect(secrets.db);
   }, 1000);
 });
 
diff --git a/config/passport.js b/config/passport.js
index dc032c8c06..33b5d395fe 100755
--- a/config/passport.js
+++ b/config/passport.js
@@ -7,10 +7,9 @@ var TwitterStrategy = require('passport-twitter').Strategy;
 var GitHubStrategy = require('passport-github').Strategy;
 var GoogleStrategy = require('passport-google-oauth').OAuth2Strategy;
 var User = require('../models/User');
-var config = require('./config');
+var secrets = require('./secrets');
 var _ = require('underscore');
 
-
 passport.serializeUser(function(user, done) {
   done(null, user.id);
 });
@@ -34,7 +33,7 @@ passport.use(new LocalStrategy(function(username, password, done) {
   });
 }));
 
-passport.use(new FacebookStrategy(config.facebook, function (req, accessToken, refreshToken, profile, done) {
+passport.use(new FacebookStrategy(secrets.facebook, function (req, accessToken, refreshToken, profile, done) {
   if (req.user) {
     User.findById(req.user.id, function(err, user) {
       user.facebook = profile.id;
@@ -64,7 +63,7 @@ passport.use(new FacebookStrategy(config.facebook, function (req, accessToken, r
   }
 }));
 
-passport.use(new GitHubStrategy(config.github, function(req, accessToken, refreshToken, profile, done) {
+passport.use(new GitHubStrategy(secrets.github, function(req, accessToken, refreshToken, profile, done) {
   if (req.user) {
     User.findById(req.user.id, function(err, user) {
       user.github = profile.id;
@@ -96,7 +95,7 @@ passport.use(new GitHubStrategy(config.github, function(req, accessToken, refres
   }
 }));
 
-passport.use(new TwitterStrategy(config.twitter, function(req, accessToken, tokenSecret, profile, done) {
+passport.use(new TwitterStrategy(secrets.twitter, function(req, accessToken, tokenSecret, profile, done) {
   if (req.user) {
     User.findById(req.user.id, function(err, user) {
       user.twitter = profile.id;
@@ -124,7 +123,7 @@ passport.use(new TwitterStrategy(config.twitter, function(req, accessToken, toke
   }
 }));
 
-passport.use(new GoogleStrategy(config.google, function(req, accessToken, refreshToken, profile, done) {
+passport.use(new GoogleStrategy(secrets.google, function(req, accessToken, refreshToken, profile, done) {
   if (req.user) {
     User.findById(req.user.id, function(err, user) {
       user.google = profile.id;
@@ -158,9 +157,9 @@ passport.use('tumblr', new OAuthStrategy({
     requestTokenURL: 'http://www.tumblr.com/oauth/request_token',
     accessTokenURL: 'http://www.tumblr.com/oauth/access_token',
     userAuthorizationURL: 'http://www.tumblr.com/oauth/authorize',
-    consumerKey: config.tumblr.consumerKey,
-    consumerSecret: config.tumblr.consumerSecret,
-    callbackURL: config.tumblr.callbackURL,
+    consumerKey: secrets.tumblr.consumerKey,
+    consumerSecret: secrets.tumblr.consumerSecret,
+    callbackURL: secrets.tumblr.callbackURL,
     passReqToCallback: true
   },
   function (req, token, tokenSecret, profile, done) {
@@ -176,9 +175,9 @@ passport.use('tumblr', new OAuthStrategy({
 passport.use('foursquare', new OAuth2Strategy({
     authorizationURL: 'https://foursquare.com/oauth2/authorize',
     tokenURL: 'https://foursquare.com/oauth2/access_token',
-    clientID: config.foursquare.clientId,
-    clientSecret: config.foursquare.clientSecret,
-    callbackURL: config.foursquare.redirectUrl,
+    clientID: secrets.foursquare.clientId,
+    clientSecret: secrets.foursquare.clientSecret,
+    callbackURL: secrets.foursquare.redirectUrl,
     passReqToCallback: true
   },
   function (req, accessToken, refreshToken, profile, done) {
@@ -200,4 +199,4 @@ exports.isAuthorized = function(req, res, next) {
   var provider = req.path.split('/').slice(-1)[0];
   if (_.findWhere(req.user.tokens, { kind: provider })) next();
   else res.redirect('/auth/' + provider);
-};
\ No newline at end of file
+};
diff --git a/controllers/api.js b/controllers/api.js
index 299c0a4d08..2abd8cefdb 100644
--- a/controllers/api.js
+++ b/controllers/api.js
@@ -1,4 +1,4 @@
-var config = require('../config/config');
+var secrets = require('../config/secrets');
 var User = require('../models/User');
 var querystring = require('querystring');
 var async = require('async');
@@ -9,7 +9,7 @@ var geoip = require('geoip-lite');
 var graph = require('fbgraph');
 var LastFmNode = require('lastfm').LastFmNode;
 var tumblr = require('tumblr.js');
-var foursquare = require('node-foursquare')({ secrets: config.foursquare });
+var foursquare = require('node-foursquare')({ secrets: secrets.foursquare });
 var Github = require('github-api');
 var Twit = require('twit');
 
@@ -68,8 +68,8 @@ exports.getFoursquare = function(req, res) {
 exports.getTumblr = function(req, res) {
   var tumblr = _.findWhere(req.user.tokens, { kind: 'tumblr' });
   var client = tumblr.createClient({
-    consumer_key: config.tumblr.consumerKey,
-    consumer_secret: config.tumblr.consumerSecret,
+    consumer_key: secrets.tumblr.consumerKey,
+    consumer_secret: secrets.tumblr.consumerSecret,
     token: tumblr.token,
     token_secret: tumblr.tokenSecret
   });
@@ -166,7 +166,7 @@ exports.getAviary = function(req, res) {
  * New York Times API example
  */
 exports.getNewYorkTimes = function(req, res) {
-  var query = querystring.stringify({ 'api-key': config.nyt.key, 'list-name': 'young-adult' });
+  var query = querystring.stringify({ 'api-key': secrets.nyt.key, 'list-name': 'young-adult' });
   var url = 'http://api.nytimes.com/svc/books/v2/lists?' + query;
   request.get(url, function(error, request, body) {
     var bestSellers = JSON.parse(body);
@@ -184,7 +184,7 @@ exports.getNewYorkTimes = function(req, res) {
  * Last.fm API example
  */
 exports.getLastfm = function(req, res) {
-  var lastfm = new LastFmNode(config.lastfm);
+  var lastfm = new LastFmNode(secrets.lastfm);
   async.parallel({
     artistInfo: function(done) {
       lastfm.request("artist.getInfo", {
@@ -243,8 +243,8 @@ exports.getLastfm = function(req, res) {
 exports.getTwitter = function(req, res) {
   var twitter = _.findWhere(req.user.tokens, { kind: 'twitter' });
   var T = new Twit({
-    consumer_key: config.twitter.consumerKey,
-    consumer_secret: config.twitter.consumerSecret,
+    consumer_key: secrets.twitter.consumerKey,
+    consumer_secret: secrets.twitter.consumerSecret,
     access_token: twitter.token,
     access_token_secret: twitter.tokenSecret
   });
diff --git a/controllers/contact.js b/controllers/contact.js
index 637a54e9c4..be6aa5c7bd 100644
--- a/controllers/contact.js
+++ b/controllers/contact.js
@@ -1,5 +1,5 @@
-var config = require('../config/config');
-var sendgrid  = require('sendgrid')(config.sendgrid.user, config.sendgrid.password);
+var secrets = require('../config/secrets');
+var sendgrid  = require('sendgrid')(secrets.sendgrid.user, secrets.sendgrid.password);
 
 exports.getContact = function(req, res) {
   res.render('contact', {
diff --git a/controllers/home.js b/controllers/home.js
index 9b052a386c..24b70e7e51 100644
--- a/controllers/home.js
+++ b/controllers/home.js
@@ -4,8 +4,3 @@ exports.index = function(req, res) {
     title: 'Home'
   });
 };
-
-exports.partials = function (req, res) {
-  var name = req.params.name;
-  res.render('partials/' + name);
-};
\ No newline at end of file