diff --git a/.htaccess b/.htaccess
index fbb84555..105d8c48 100755
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 #Comment out the two folling lines when running server locally to fix issues with localhost
-#RewriteCond %{HTTPS} !=on
-#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+RewriteCond %{HTTPS} !=on
+RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
diff --git a/server/gulpfile.js b/server/gulpfile.js
index 90fdfeae..997257ac 100644
--- a/server/gulpfile.js
+++ b/server/gulpfile.js
@@ -10,8 +10,8 @@ gulp.task('js', function () {
         	compress: true,
         	enclose: true
         }))
-        .pipe(concat('main.js'))
-        .pipe(gulp.dest('../static/build-js'));
+        .pipe(concat('main-min.js'))
+        .pipe(gulp.dest('../static/dist'));
 });
 
 gulp.task('nochan', function () {
@@ -21,8 +21,8 @@ gulp.task('nochan', function () {
             compress: true,
             enclose: true
         }))
-        .pipe(concat('main-fp.js'))
-        .pipe(gulp.dest('../static/build-js'));
+        .pipe(concat('frontpage-min.js'))
+        .pipe(gulp.dest('../static/dist'));
 });
 
 gulp.task('remotecontroller', function () {
@@ -32,8 +32,8 @@ gulp.task('remotecontroller', function () {
             compress: true,
             enclose: true
         }))
-        .pipe(concat('remotecontroller-min.js'))
-        .pipe(gulp.dest('../static/build-js'));
+        .pipe(concat('remote-min.js'))
+        .pipe(gulp.dest('../static/dist'));
 });
 
 gulp.task('default', function(){
diff --git a/server/server.js b/server/server.js
index 033269e1..44b116ad 100755
--- a/server/server.js
+++ b/server/server.js
@@ -4,7 +4,7 @@ var server;
 This if for the localhost running
 
 ******/
-localhost = true;
+localhost = false;
 
 //https server
 if(localhost)