diff --git a/.gitignore b/.gitignore
index 0138a8330c..46114451b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,8 @@
 .sass-cache/
 npm-debug.log
 node_modules/
-public/lib
-app/tests/coverage/
+public/lib/
+public/dist/
 .bower-*/
 .idea/
 uploads
@@ -21,6 +21,7 @@ Outset-Logo_*.png
 scratchpad.*
 public
 log
+app/tests/coverage/
 
 # Elastic Beanstalk Files
 .elasticbeanstalk/*
diff --git a/.slugignore b/.slugignore
index e4e50baab8..4611d35f44 100644
--- a/.slugignore
+++ b/.slugignore
@@ -1 +1 @@
-/app/tests
\ No newline at end of file
+/app/tests
diff --git a/.travis.yml b/.travis.yml
index 0abd7e4bb2..32edf2495e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ node_js:
 env:
   - NODE_ENV=travis
 services:
-  - mongodb
\ No newline at end of file
+  - mongodb
diff --git a/Procfile b/Procfile
old mode 100755
new mode 100644
diff --git a/config/assets/test.js b/config/assets/test.js
index ecc4cac91d..29ffa89c9e 100644
--- a/config/assets/test.js
+++ b/config/assets/test.js
@@ -6,4 +6,4 @@ module.exports = {
 		server: ['modules/*/tests/server/**/*.js'],
 		e2e: ['modules/*/tests/e2e/**/*.js']
 	}
-};
\ No newline at end of file
+};
diff --git a/config/config.js b/config/config.js
index 501cc7b2c6..dcdfd7715b 100644
--- a/config/config.js
+++ b/config/config.js
@@ -91,7 +91,7 @@ var initGlobalConfigFolders = function (config, assets) {
     };
 
     // Setting globbed client paths
-    config.folders.client = getGlobbedPaths(path.join(process.cwd(), 'modules/*/client/'), process.cwd());
+    config.folders.client = getGlobbedPaths(path.join(process.cwd(), 'modules/*/client/'), process.cwd().replace(new RegExp(/\\/g),'/'));
 };
 
 /**
diff --git a/config/lib/express.js b/config/lib/express.js
old mode 100755
new mode 100644
diff --git a/fig.yml b/fig.yml
index 4726a15100..967ac7d1d1 100644
--- a/fig.yml
+++ b/fig.yml
@@ -9,4 +9,4 @@ web:
 db:
   image: mongo
   ports: 
-   - "27017:27017"
\ No newline at end of file
+   - "27017:27017"
diff --git a/modules/articles/client/articles.client.module.js b/modules/articles/client/articles.client.module.js
old mode 100755
new mode 100644
index 7435fc78a8..3c94d0cb57
--- a/modules/articles/client/articles.client.module.js
+++ b/modules/articles/client/articles.client.module.js
@@ -1,4 +1,4 @@
 'use strict';
 
 // Use Applicaion configuration module to register a new module
-ApplicationConfiguration.registerModule('articles');
\ No newline at end of file
+ApplicationConfiguration.registerModule('articles');
diff --git a/modules/articles/client/config/articles.client.routes.js b/modules/articles/client/config/articles.client.routes.js
old mode 100755
new mode 100644
diff --git a/modules/articles/client/controllers/articles.client.controller.js b/modules/articles/client/controllers/articles.client.controller.js
index 364987eb9e..2ea4e2a856 100644
--- a/modules/articles/client/controllers/articles.client.controller.js
+++ b/modules/articles/client/controllers/articles.client.controller.js
@@ -55,4 +55,4 @@ angular.module('articles').controller('ArticlesController', ['$scope', '$statePa
 			});
 		};
 	}
-]);
\ No newline at end of file
+]);
diff --git a/modules/articles/server/models/article.server.model.js b/modules/articles/server/models/article.server.model.js
index 3f6fd0df1f..f2b89db815 100644
--- a/modules/articles/server/models/article.server.model.js
+++ b/modules/articles/server/models/article.server.model.js
@@ -31,4 +31,4 @@ var ArticleSchema = new Schema({
 	}
 });
 
-mongoose.model('Article', ArticleSchema);
\ No newline at end of file
+mongoose.model('Article', ArticleSchema);
diff --git a/modules/articles/tests/client/articles.client.controller.tests.js b/modules/articles/tests/client/articles.client.controller.tests.js
index 859a967e47..326a9b45c8 100644
--- a/modules/articles/tests/client/articles.client.controller.tests.js
+++ b/modules/articles/tests/client/articles.client.controller.tests.js
@@ -167,4 +167,4 @@
 			expect(scope.articles.length).toBe(0);
 		}));
 	});
-}());
\ No newline at end of file
+}());
diff --git a/modules/articles/tests/server/article.server.model.tests.js b/modules/articles/tests/server/article.server.model.tests.js
index ee5fd067b5..b4b76b8a93 100644
--- a/modules/articles/tests/server/article.server.model.tests.js
+++ b/modules/articles/tests/server/article.server.model.tests.js
@@ -57,8 +57,8 @@ describe('Article Model Unit Tests:', function() {
 	});
 
 	afterEach(function(done) {
-		Article.remove().exec();
-		User.remove().exec();
-		done();
+		Article.remove().exec(function() {
+			User.remove().exec(done);
+		});
 	});
 });
diff --git a/modules/articles/tests/server/article.server.routes.tests.js b/modules/articles/tests/server/article.server.routes.tests.js
index f6588c2057..de039cbbc9 100644
--- a/modules/articles/tests/server/article.server.routes.tests.js
+++ b/modules/articles/tests/server/article.server.routes.tests.js
@@ -270,8 +270,8 @@ describe('Article CRUD tests', function() {
 	});
 
 	afterEach(function(done) {
-		User.remove().exec();
-		Article.remove().exec();
-		done();
+		User.remove().exec(function() {
+			Article.remove().exec(done);
+		});
 	});
 });
diff --git a/modules/chat/tests/client/chat.client.controller.tests.js b/modules/chat/tests/client/chat.client.controller.tests.js
index e842322891..8a31f1930f 100644
--- a/modules/chat/tests/client/chat.client.controller.tests.js
+++ b/modules/chat/tests/client/chat.client.controller.tests.js
@@ -7,4 +7,4 @@
 	describe('ChatController', function() {
 		// TODO: Add chat client controller tests
 	});
-}());
\ No newline at end of file
+}());
diff --git a/modules/chat/tests/e2e/chat.e2e.tests.js b/modules/chat/tests/e2e/chat.e2e.tests.js
index 06f5fc6226..d3fd973c29 100644
--- a/modules/chat/tests/e2e/chat.e2e.tests.js
+++ b/modules/chat/tests/e2e/chat.e2e.tests.js
@@ -5,4 +5,4 @@
  */
 describe('Chat E2E Tests:', function() {
 	// TODO: Add chat e2e tests
-});
\ No newline at end of file
+});
diff --git a/modules/chat/tests/server/chat.socket.tests.js b/modules/chat/tests/server/chat.socket.tests.js
index 8a82c74ea2..f900e2f626 100644
--- a/modules/chat/tests/server/chat.socket.tests.js
+++ b/modules/chat/tests/server/chat.socket.tests.js
@@ -5,4 +5,4 @@
  */
 describe('Chat Socket Tests:', function() {
 	// TODO: Add chat socket tests
-});
\ No newline at end of file
+});
diff --git a/modules/core/client/core.client.module.js b/modules/core/client/core.client.module.js
old mode 100755
new mode 100644
diff --git a/modules/core/server/views/layout.server.view.html b/modules/core/server/views/layout.server.view.html
index 42bb5a2364..a760fe1793 100644
--- a/modules/core/server/views/layout.server.view.html
+++ b/modules/core/server/views/layout.server.view.html
@@ -2,49 +2,49 @@
 <html lang="en" xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-    <title>{{title}}</title>
-
-    <!-- General META -->
-    <meta charset="utf-8">
-    <meta http-equiv="Content-type" content="text/html;charset=UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="fragment" content="!" />
-    <base href="/" />
-
-    <!-- Responsive META -->
-    <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-
-
-    <!-- Semantic META -->
-    <meta name="keywords" content="{{keywords}}">
-    <meta name="description" content="{{description}}">
-
-    <!-- Facebook META -->
-    <meta property="fb:app_id" content="{{facebookAppId}}">
-    <meta property="og:site_name" content="{{title}}">
-    <meta property="og:title" content="{{title}}">
-    <meta property="og:description" content="{{description}}">
-    <meta property="og:url" content="{{url}}">
-    <meta property="og:image" content="/img/brand/logo.png">
-    <meta property="og:type" content="website">
-
-    <!-- Twitter META -->
-    <meta name="twitter:title" content="{{title}}">
-    <meta name="twitter:description" content="{{description}}">
-    <meta name="twitter:url" content="{{url}}">
-    <meta name="twitter:image" content="/img/brand/logo.png">
-
-    <!-- Fav Icon -->
-    <link href="/modules/core/img/brand/favicon.ico" rel="shortcut icon" type="image/x-icon">
-
-    <!--Application CSS Files-->
+	<title>{{title}}</title>
+
+	<!-- General META -->
+	<meta charset="utf-8">
+	<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+	<meta name="fragment" content="!" />
+	<base href="/"/>
+
+	<!-- Responsive META -->
+	<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+	<!-- Semantic META -->
+	<meta name="keywords" content="{{keywords}}">
+	<meta name="description" content="{{description}}">
+
+	<!-- Facebook META -->
+	<meta property="fb:app_id" content="{{facebookAppId}}">
+	<meta property="og:site_name" content="{{title}}">
+	<meta property="og:title" content="{{title}}">
+	<meta property="og:description" content="{{description}}">
+	<meta property="og:url" content="{{url}}">
+	<meta property="og:image" content="{{url}}modules/core/img/brand/logo.png">
+	<meta property="og:type" content="website">
+
+	<!-- Twitter META -->
+	<meta name="twitter:title" content="{{title}}">
+	<meta name="twitter:description" content="{{description}}">
+	<meta name="twitter:url" content="{{url}}">
+	<meta name="twitter:image" content="{{url}}modules/core/img/brand/logo.png">
+
+	<!-- Fav Icon -->
+	<link href="/modules/core/img/brand/favicon.ico" rel="shortcut icon" type="image/x-icon">
+
+	<!--Application CSS Files-->
     {% for cssFile in cssFiles %}
-    <link rel="stylesheet" href="{{cssFile}}">{% endfor %}
+    <link rel="stylesheet" href="{{cssFile}}">
+    {% endfor %}
 
-    <!-- HTML5 Shim -->
-    <!--[if lt IE 9]>
+	<!-- HTML5 Shim -->
+	<!--[if lt IE 9]>
 		<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
 	<![endif]-->
 </head>
@@ -53,31 +53,34 @@
     <div class="outer-container">
     <ng-include src="'/modules/core/views/header.client.view.html'" class="navbar navbar-fixed-top"></ng-include>
 
-    <section class="content">
+	<section class="content">
         <os-debug-info></os-debug-info>
-        {% block content %}{% endblock %}
-    </section>
+			{% block content %}{% endblock %}
+		</section>
 
     <footer data-ng-include="'/modules/core/views/footer.client.view.html'" class="navbar navbar-bottom"></footer>
 
     </div>
-    <!--Embedding The User Object-->
-    <script type="text/javascript">
-    var user = {{ user | json | safe }};
-    </script>
-
-    <!--Load The Socket.io File-->
-    <script type="text/javascript" src="/socket.io/socket.io.js"></script>
-
-    <!--Application JavaScript Files-->
+	<!--Embedding The User Object-->
+	<script type="text/javascript">
+		var user = {{ user | json | safe }};
+	</script>
+	
+	<!--Load The Socket.io File-->
+	<script type="text/javascript" src="/socket.io/socket.io.js"></script>
+
+	<!--Application JavaScript Files-->
     {% for jsFile in jsFiles %}
-    <script type="text/javascript" src="{{jsFile}}"></script>{% endfor %} {% if process.env.NODE_ENV === 'development' %}
-    <!--Livereload script rendered -->
-    <script type="text/javascript" src="{{host}}:35729/livereload.js"></script>
-    {% endif %}
+    <script type="text/javascript" src="{{jsFile}}"></script>
+    {% endfor %} 
 
-    <!-- Google Analytics -->
-    <script>
+    {% if process.env.NODE_ENV === 'development' %}
+	<!--Livereload script rendered -->
+	<script type="text/javascript" src="{{host}}:35729/livereload.js"></script>
+	{% endif %}
+
+	<!-- Google Analytics -->
+	<script>
     (function(i, s, o, g, r, a, m) {
         i['GoogleAnalyticsObject'] = r;
         i[r] = i[r] || function() {
@@ -88,11 +91,11 @@
         a.async = 1;
         a.src = g;
         m.parentNode.insertBefore(a, m)
-    })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-    ga('create', '{{googleAnalyticsTrackingID}}', 'auto');
+		ga('create', '{{googleAnalyticsTrackingID}}', 'auto');
     /*ga('send', 'pageview');*/ /* DISABLE In Favor of $rootScope.$stateChangeSuccess*/
-    </script>
+	</script>
 
     <!-- Google Code for Remarketing Tag -->
     <!--------------------------------------------------
diff --git a/modules/core/tests/client/header.client.controller.tests.js b/modules/core/tests/client/header.client.controller.tests.js
index 76ee4fb4e7..b45cc26b37 100644
--- a/modules/core/tests/client/header.client.controller.tests.js
+++ b/modules/core/tests/client/header.client.controller.tests.js
@@ -21,4 +21,4 @@
 			expect(scope.authentication).toBeTruthy();
 		});
 	});
-})();
\ No newline at end of file
+})();
diff --git a/modules/users/client/config/users.client.routes.js b/modules/users/client/config/users.client.routes.js
old mode 100755
new mode 100644
diff --git a/modules/users/client/services/authentication.client.service.js b/modules/users/client/services/authentication.client.service.js
index bbfec87bfc..9e043d1741 100644
--- a/modules/users/client/services/authentication.client.service.js
+++ b/modules/users/client/services/authentication.client.service.js
@@ -1,9 +1,9 @@
 (function () {
-    'use strict';
+'use strict';
 
 // Authentication service for user variables
 
-    function AuthenticationService() {
+    function AuthenticationService($window) {
         var _this = this;
 
         function isLoggedIn() {
@@ -16,13 +16,15 @@
         }
 
         _this._data = {
-            user: window.user,
+            user: $window.user,
             isLoggedIn: isLoggedIn,
             isAdmin: isAdmin
-        };
+		};
 
-        return _this._data;
-    }
+		return _this._data;
+	}
+
+	AuthenticationService.$inject = ['$window'];
 
     angular
         .module('users')
diff --git a/modules/users/client/users.client.module.js b/modules/users/client/users.client.module.js
old mode 100755
new mode 100644
diff --git a/modules/users/server/config/strategies/facebook.js b/modules/users/server/config/strategies/facebook.js
index 4329c4d03b..dfec829c79 100644
--- a/modules/users/server/config/strategies/facebook.js
+++ b/modules/users/server/config/strategies/facebook.js
@@ -14,7 +14,7 @@ module.exports = function(config) {
 			clientID: config.facebook.clientID,
 			clientSecret: config.facebook.clientSecret,
 			callbackURL: config.facebook.callbackURL,
-			profileFields: ['id', 'name', 'displayName', 'email', 'username', 'photos'],
+			profileFields: ['id', 'name', 'displayName', 'emails', 'photos'],
 			passReqToCallback: true
 		},
 		function(req, accessToken, refreshToken, profile, done) {
@@ -29,8 +29,7 @@ module.exports = function(config) {
 				lastName: profile.name.familyName,
 				displayName: profile.displayName,
 				email: profile.emails[0].value,
-				username: profile.username,
-				profileImageURL: (profile.photos && profile.photos.length) ? profile.photos[0].value : undefined,
+				profileImageURL: (profile.id) ? '//graph.facebook.com/' + profile.id + '/picture?type=large' : undefined,
 				provider: 'facebook',
 				providerIdentifierField: 'id',
 				providerData: providerData
diff --git a/modules/users/server/config/strategies/twitter.js b/modules/users/server/config/strategies/twitter.js
index f58de392c2..b7d46435b7 100644
--- a/modules/users/server/config/strategies/twitter.js
+++ b/modules/users/server/config/strategies/twitter.js
@@ -26,7 +26,7 @@ module.exports = function(config) {
 			var providerUserProfile = {
 				displayName: profile.displayName,
 				username: profile.username,
-				profileImageURL: (profile.photos && profile.photos.length) ? profile.photos[0].value : undefined,
+				profileImageURL: profile.photos[0].value.replace('normal', 'bigger'),
 				provider: 'twitter',
 				providerIdentifierField: 'id_str',
 				providerData: providerData
diff --git a/modules/users/server/controllers/users.server.controller.js b/modules/users/server/controllers/users.server.controller.js
old mode 100755
new mode 100644
index 64e772e9a7..06ef00ea31
--- a/modules/users/server/controllers/users.server.controller.js
+++ b/modules/users/server/controllers/users.server.controller.js
@@ -13,4 +13,4 @@ module.exports = _.extend(
 	require('./users/users.authorization.server.controller'),
 	require('./users/users.password.server.controller'),
 	require('./users/users.profile.server.controller')
-);
\ No newline at end of file
+);
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
old mode 100755
new mode 100644
diff --git a/modules/users/server/templates/reset-password-confirm-email.server.view.html b/modules/users/server/templates/reset-password-confirm-email.server.view.html
index eec61a672c..baeddbf957 100644
--- a/modules/users/server/templates/reset-password-confirm-email.server.view.html
+++ b/modules/users/server/templates/reset-password-confirm-email.server.view.html
@@ -13,4 +13,4 @@
 	<p>The {{appName}} Support Team</p>
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/modules/users/tests/server/user.server.model.tests.js b/modules/users/tests/server/user.server.model.tests.js
index e1cb6d4749..7f813caf95 100644
--- a/modules/users/tests/server/user.server.model.tests.js
+++ b/modules/users/tests/server/user.server.model.tests.js
@@ -52,10 +52,11 @@ describe('User Model Unit Tests:', function() {
 		});
 
 		it('should fail to save an existing user again', function(done) {
-			user.save();
-			return user2.save(function(err) {
-				should.exist(err);
-				done();
+			user.save(function() {
+				user2.save(function(err) {
+					should.exist(err);
+					done();
+				});	
 			});
 		});
 
@@ -101,7 +102,6 @@ describe('User Model Unit Tests:', function() {
     });
 
 	after(function(done) {
-		User.remove().exec();
-		done();
+		User.remove().exec(done);
 	});
 });
diff --git a/server.js b/server.js
old mode 100755
new mode 100644