diff --git a/docs/faq.rst b/docs/faq.rst
index 115d319f..4354ab9e 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -4,9 +4,14 @@ Frequently Asked Questions
 Common Problems
 ---------------
 
-In my startup logs I see *'Aborting... Lemur cannot locate db encryption key, is ENCRYPTION_KEY set?'*
-  You likely have not correctly configured **ENCRYPTION_KEY**. See
-  :doc:`administration/configuration` for more information.
+In my startup logs I see *'Aborting... Lemur cannot locate db encryption key, is LEMUR_ENCRYPTION_KEY set?'*
+  You likely have not correctly configured **LEMUR_ENCRYPTION_KEY**. See
+  :doc:`administration/index` for more information.
+
+
+I am seeing Lemur's javascript load in my browser but not the CSS.
+  Ensure that you are placing *include mime.types;* to your Nginx static file location. See
+  :doc:`production/index` for example configurations.
 
 
 How do I
diff --git a/docs/production/index.rst b/docs/production/index.rst
index 2f788cfa..f3f32a35 100644
--- a/docs/production/index.rst
+++ b/docs/production/index.rst
@@ -106,7 +106,12 @@ You can make some adjustments to get a better user experience::
         }
 
         location / {
+<<<<<<< HEAD
             root /apps/lemur/lemur/static/dist;
+=======
+            root /www/lemur/lemur/static/dist;
+            include mime.types;
+>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
             index index.html;
         }
 
@@ -171,7 +176,12 @@ sensitive nature of Lemur and what it controls makes this essential. This is a s
         }
 
         location / {
+<<<<<<< HEAD
             root /apps/lemur/lemur/static/dist;
+=======
+            root /www/lemur/lemur/static/dist;
+            include mime.types;
+>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
             index index.html;
         }
 
@@ -204,6 +214,9 @@ An example apache config::
 Also included in the configurations above are several best practices when it comes to deploying SSL. Things like enabling
 HSTS, disabling vulnerable ciphers are all good ideas when it comes to deploying Lemur into a production environment.
 
+.. note::
+    This is a rather incomplete apache config for running Lemur (needs mod_wsgi etc.,), if you have a working apache config please let us know!
+
 .. seealso::
     `Mozilla SSL Configuration Generator <https://mozilla.github.io/server-side-tls/ssl-config-generator/>`_
 
diff --git a/docs/quickstart/index.rst b/docs/quickstart/index.rst
index 2e39a645..432b14c3 100644
--- a/docs/quickstart/index.rst
+++ b/docs/quickstart/index.rst
@@ -148,6 +148,7 @@ Proxying with Nginx
 You'll use the builtin HttpProxyModule within Nginx to handle proxying::
 
     location / {
+<<<<<<< HEAD
       proxy_pass         http://localhost:5000;
       proxy_redirect     off;
 
@@ -155,6 +156,11 @@ You'll use the builtin HttpProxyModule within Nginx to handle proxying::
       proxy_set_header   X-Real-IP         $remote_addr;
       proxy_set_header   X-Forwarded-For   $proxy_add_x_forwarded_for;
       proxy_set_header   X-Forwarded-Proto $scheme;
+=======
+        root /www/lemur/lemur/static/dist;
+        include mime.types;
+        index index.html;
+>>>>>>> b978435... Merge pull request #21 from kevgliss/buildfixes
     }
 
 See :doc:`../production/index` for more details on using Nginx.
diff --git a/gulp/build.js b/gulp/build.js
index 9326d6be..4346a6de 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -26,7 +26,7 @@ var gulp = require('gulp'),
   imagemin = require('gulp-imagemin'),
   minifyHtml = require('gulp-minify-html'),
   bowerFiles = require('main-bower-files'),
-  replace = require('gulp-replace-task');
+  replace = require('gulp-replace');
 
 
 gulp.task('default', ['clean'], function () {
@@ -227,5 +227,15 @@ gulp.task('build:images', function () {
     .pipe(size());
 });
 
+gulp.task('package:strip', function () {
+  return gulp.src(['lemur/static/dist/scripts/main*'])
+    .pipe(replace('http:\/\/localhost:5000', ''))
+    .pipe(replace('http:\/\/localhost:3000', ''))
+    .pipe(useref())
+    .pipe(revReplace())
+    .pipe(gulp.dest('lemur/static/dist/scripts'))
+    .pipe(size());
+});
 
 gulp.task('build', ['build:ngviews', 'build:inject', 'build:images', 'build:fonts', 'build:html', 'build:extras']);
+gulp.task('package', ['package:strip']);
diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js
index af4957f9..3ed03188 100644
--- a/lemur/static/app/angular/app.js
+++ b/lemur/static/app/angular/app.js
@@ -62,7 +62,7 @@ lemur.controller('datePickerController', function ($scope, $timeout){
 
 lemur.factory('LemurRestangular', function (Restangular, $location, $auth) {
   return Restangular.withConfig(function (RestangularConfigurer) {
-    RestangularConfigurer.setBaseUrl('http://127.0.0.1:5000/api/1');
+    RestangularConfigurer.setBaseUrl('http://localhost:5000/api/1');
     RestangularConfigurer.setDefaultHttpFields({withCredentials: true});
 
     RestangularConfigurer.addResponseInterceptor(function (data, operation, what, url, response, deferred) {
diff --git a/package.json b/package.json
index ee027237..b66140e1 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "gulp-plumber": "^0.6.4",
     "gulp-print": "^1.1.0",
     "gulp-protractor": "0.0.11",
-    "gulp-replace": "~0.4.0",
+    "gulp-replace": "~0.5.3",
     "gulp-replace-task": "~0.1.0",
     "gulp-rev": "^1.0.0",
     "gulp-rev-replace": "^0.3.0",
diff --git a/setup.py b/setup.py
index 5e07860b..6fe6f23f 100644
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,8 @@ class BuildStatic(Command):
 
         log.info("running [gulp buld]")
         check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'build'], cwd=ROOT)
+        log.info("running [gulp package]")
+        check_output([os.path.join(ROOT, 'node_modules', '.bin', 'gulp'), 'package'], cwd=ROOT)
 
 setup(
     name='lemur',