diff --git a/Gruntfile.js b/Gruntfile.js
index 9fbe6e4..e3a507f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -102,8 +102,6 @@ module.exports = function (grunt) {
 							require('json-proxy').initialize(proxyConfig),
 							mountFolder(connect, '.grunt'),
 							mountFolder(connect, '.tmp'),
-							mountFolder(connect, config.publicDir),
-							mountFolder(connect, config.staticDir),
 							mountFolder(connect, 'app')
 						];
 					}
@@ -418,7 +416,6 @@ module.exports = function (grunt) {
 						src: [
 							'*.{ico,png,txt}', '.htaccess',
 							//'bower_components/**/*',
-							'libs/*',
 							'images/{,*/}*.{webp}',
 							'fonts/*'
 						]
@@ -666,7 +663,7 @@ module.exports = function (grunt) {
 		'concurrent:dist',
 		'autoprefixer',
 		'concat',
-		//'ngmin',
+		'ngmin',
 		'ngtemplates',
 		'copy:dist',
 		//'cdnify',
diff --git a/app/index.html b/app/index.html
index fa9a350..a463c2e 100755
--- a/app/index.html
+++ b/app/index.html
@@ -46,7 +46,7 @@
   <meta name="msapplication-square310x310logo" content="images/mstile-310x310.png">
   <meta name="msapplication-wide310x150logo" content="images/mstile-310x150.png">
 
-  <!-- build:css({.tmp,app}) styles/main.css -->
+  <!-- build:css({.tmp,app}) styles/app.css -->
   <link rel="stylesheet" href="bower_components/angular-motion/dist/angular-motion.min.css">
   <link rel="stylesheet" href="bower_components/bootstrap-additions/dist/bootstrap-additions.min.css">
   <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css">
@@ -55,6 +55,10 @@
   <!-- endbuild -->
   <link rel="stylesheet" ng-href="{{App.settings.cdn}}/bootswatch.com/{{App.theme | lowercase}}/bootstrap.min.css"/>
 
+	<!--[if lt IE 9]>
+	<script src="bower_components/es5-shim/es5-shim.js"></script>
+	<script src="bower_components/json3/lib/json3.min.js"></script>
+	<![endif]-->
 </head>
 <body data-ng-class="App.route.current.scope.name">
 
@@ -62,10 +66,6 @@
 	<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
 	<![endif]-->
 
-	<!--[if lt IE 9]>
-	<script src="bower_components/es5-shim/es5-shim.js"></script>
-	<script src="bower_components/json3/lib/json3.min.js"></script>
-	<![endif]-->
 
 	<div id="app" class="app" data-ng-controller="AppCtrl" data-ng-cloak>
 	  <header id="header" data-ng-include="App.layout.header">
@@ -98,6 +98,12 @@
 	<script src="bower_components/es5-shim/es5-shim.js"></script>
 	<script src="bower_components/json3/lib/json3.min.js"></script>
 	<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
+	<script src="libs/parse-1.2.17.min.js"></script>
+  <script src="libs/md5.js"></script>
+  <script src="libs/markdown.js"></script>
+	<!-- endbuild -->
+	
+  <!-- build:js({.tmp,app}) scripts/modules.js -->
 	<script src="bower_components/angular/angular.js"></script>
 	<script src="bower_components/angular-ui-utils/ui-utils.js"></script>
 	<script src="bower_components/angular-strap/dist/angular-strap.min.js"></script>
@@ -108,12 +114,9 @@
 	<script src="bower_components/angular-cookies/angular-cookies.js"></script>
 	<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
 	<script src="bower_components/angular-form-gen/dist/angular-form-gen.js"></script>
-	<!-- endbower -->
-  <!-- Dependent libs -->
-  <script src="libs/parse-1.2.17.min.js"></script>
-  <script src="libs/md5.js"></script>
-  <script src="libs/markdown.js"></script>
-	<!-- endbuild -->
+  <!-- endbuild -->
+  
+  <!-- endbower -->
 
 	<!-- build:js({.tmp,app}) scripts/scripts.js -->
 	<script src="scripts/config.js"></script>
diff --git a/config/config.json b/config/config.json
index 1d1f42c..2f39f37 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,12 +1,12 @@
 {
-	"baseurl":"http://localhost:8181",
+	"baseurl":"http://127.0.0.1:8181",
 	"sitetitle":"angular-cms",
 	"sitedesc":"This is the description",
 	"sitebrand":"/images/angular-cms-brand.png",
 	"sitecopy":"2014 ",
 	"version":"0.1",
 	"email":"jonniespratley@me.com",
-	"host":"localhost",
+	"host": "127.0.0.1",
 	"port":8181,
 	"apiBase":"/api/v2",
 	"version":"v2",
@@ -37,7 +37,7 @@
 	"publicDir":"www",
 	"uploadsTmpDir":".tmp",
 	"uploadsDestDir":"www/cms-content/uploads",
-	"uploadsUrl":":8181/cms-content/",
+	"uploadsUrl":"/cms-content/",
 	"logFormat":"[:date] - [:method] - :url - :status - :response-time ms",
 	"debug":true,
 	"feature":{
diff --git a/npm-debug.log b/npm-debug.log
deleted file mode 100644
index 26cc712..0000000
--- a/npm-debug.log
+++ /dev/null
@@ -1,26 +0,0 @@
-0 info it worked if it ends with ok
-1 verbose cli [ 'node', '/usr/local/bin/npm', 'start' ]
-2 info using npm@1.4.21
-3 info using node@v0.10.30
-4 verbose run-script [ 'prestart', 'start', 'poststart' ]
-5 info prestart angular-cms@0.0.1
-6 info start angular-cms@0.0.1
-7 verbose unsafe-perm in lifecycle true
-8 info angular-cms@0.0.1 Failed to exec start script
-9 error angular-cms@0.0.1 start: `node server.js`
-9 error Exit status 8
-10 error Failed at the angular-cms@0.0.1 start script.
-10 error This is most likely a problem with the angular-cms package,
-10 error not with npm itself.
-10 error Tell the author that this fails on your system:
-10 error     node server.js
-10 error You can get their info via:
-10 error     npm owner ls angular-cms
-10 error There is likely additional logging output above.
-11 error System Darwin 14.0.0
-12 error command "node" "/usr/local/bin/npm" "start"
-13 error cwd /WWW/Learning_Yeoman/angular-cms
-14 error node -v v0.10.30
-15 error npm -v 1.4.21
-16 error code ELIFECYCLE
-17 verbose exit [ 1, true ]
diff --git a/package.json b/package.json
index e9f7a78..02e843f 100755
--- a/package.json
+++ b/package.json
@@ -94,6 +94,7 @@
     "grunt-karma-coveralls": "^2.5.1",
     "grunt-mocha-test": "^0.12.4",
     "grunt-newer": "~0.5.4",
+    "grunt-ng-annotate": "^0.8.0",
     "grunt-ngdocs": "~0.1.7",
     "grunt-ngmin": "0.0.3",
     "grunt-protractor-runner": "^1.1.0",
@@ -132,7 +133,8 @@
     "karma": "~0.12.0"
   },
   "engines": {
-    "node": ">=0.10.0"
+    "node": "0.10.x",
+    "npm": "1.3.x"
   },
   "scripts": {
     "test": "grunt test",
diff --git a/routes/cms-router.js b/routes/cms-router.js
index 4322d2c..add095c 100644
--- a/routes/cms-router.js
+++ b/routes/cms-router.js
@@ -2,6 +2,12 @@ var http = require('http'), util = require('util');
 
 module.exports.mount = function(config, app) {
 	'use strict';
+	
+	//Fix for cloud foundry
+	if(process.env.VCAP_APP_PORT ){
+		config.port = process.env.VCAP_APP_PORT;
+	}
+	
 
 	var server = http.createServer(app);
 	var serverPort = process.env.PORT || config.port;
