diff --git a/Gruntfile.js b/Gruntfile.js
index 34be01a..8b52093 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,7 +85,7 @@ module.exports = function (grunt) {
 			options: {
 				port: SERVER_PORT,
 				// Change this to '0.0.0.0' to access the server from outside.
-				hostname: '127.0.0.1',
+				hostname: config.host,
 				livereload: LIVERELOAD_PORT,
 				base: ['.tmp', '<%= yeoman.app %>'],
 				onCreateServer: function(server, connect, options) {
@@ -659,9 +659,7 @@ module.exports = function (grunt) {
 			return grunt.task.run(['karma:unit', 'coveralls']);
 		}
 	});
-
-	grunt.registerTask('ptor', ['coffee:test', 'protractor_webdriver', 'protractor']);
-	grunt.registerTask('build-docs', ['useminPrepare', 'autoprefixer', 'concat', 'ngmin']);
+	
 	grunt.registerTask('build', [
 		'clean:dist',
 		'useminPrepare',
@@ -671,13 +669,15 @@ module.exports = function (grunt) {
 		'ngtemplates',
 		'ngmin',
 		'copy:dist',
-		'cdnify',
+		//'cdnify',
 		'cssmin',
 		'uglify',
 		'rev',
 		'usemin'
 	]);
 
+	grunt.registerTask('ptor', ['coffee:test', 'protractor_webdriver', 'protractor']);
+	grunt.registerTask('build-docs', ['useminPrepare', 'autoprefixer', 'concat', 'ngmin']);
 	grunt.registerTask('docs', ['coffee', 'ngdocs', 'connect:docs', 'watch:scripts']);
 	grunt.registerTask('default', ['newer:jshint', 'test', 'build']);
 
diff --git a/app/index.html b/app/index.html
index e9997c1..f232cbc 100755
--- a/app/index.html
+++ b/app/index.html
@@ -35,6 +35,9 @@
   <link rel="icon" type="image/png" href="images/favicon-96x96.png" sizes="96x96">
   <link rel="icon" type="image/png" href="images/favicon-16x16.png" sizes="16x16">
   <link rel="icon" type="image/png" href="images/favicon-32x32.png" sizes="32x32">
+  
+  
+  
   <meta name="msapplication-TileColor" content="#da532c">
   <meta name="msapplication-TileImage" content="images/mstile-144x144.png">
   <meta name="msapplication-square70x70logo" content="images/mstile-70x70.png">
@@ -89,7 +92,7 @@
 	</script>
 
 	<!--script src="/socket.io/socket.io.js"></script--!>
-
+	<!-- build:js({.tmp,app}) scripts/vendor.js -->
   <!-- bower:js -->
 	<script src="bower_components/jquery/jquery.js"></script>
 	<script src="bower_components/jquery-ui/ui/jquery-ui.js"></script>
diff --git a/config/config.json b/config/config.json
index e1a192c..1d1f42c 100644
--- a/config/config.json
+++ b/config/config.json
@@ -6,7 +6,7 @@
 	"sitecopy":"2014 ",
 	"version":"0.1",
 	"email":"jonniespratley@me.com",
-	"host":"http://localhost",
+	"host":"localhost",
 	"port":8181,
 	"apiBase":"/api/v2",
 	"version":"v2",
diff --git a/routes/cms-passport.js b/routes/cms-passport.js
index d4b926c..7ec03dd 100644
--- a/routes/cms-passport.js
+++ b/routes/cms-passport.js
@@ -178,10 +178,12 @@ var cmsPassport = function(config, app) {
 	 * TODO: Handle configuring passport
 	 *
 	 */
-	app.use(express.static(path.resolve(__dirname + path.sep + 'views')));
-	app.set('views', path.resolve(__dirname + path.sep + 'views'));
-	app.set('view engine', 'ejs');
-	app.engine('ejs', require('ejs-locals'));
+	app.use(express.static(path.resolve(config.staticDir)));
+	app.use(express.static(path.resolve(config.publicDir)));
+	//app.set('views', path.resolve(__dirname + path.sep + 'views'));
+	app.set('views', path.resolve(config.publicDir));
+	//app.set('view engine', 'ejs');
+	//app.engine('ejs', require('ejs-locals'));
 
 	app.use(cookieParser());
 	app.use(bodyParser.urlencoded({