diff --git a/.env.bak b/.env.bak
deleted file mode 100644
index 403ac056..00000000
--- a/.env.bak
+++ /dev/null
@@ -1,14 +0,0 @@
-APP_ENV=dev
-APP_KEY=base64:ve66Z5Kt/zTN3p++0zOPu854PHfZkwJE5VuoFAlzHtI=
-APP_DEBUG=true
-APP_LOCALE=en
-APP_URL=http://localhost
-
-APP_LOG=daily
-APP_LOG_LEVEL=debug
-APP_LOG_MAX_FILES=7
-
-DB_CONNECTION=sqlite
-
-CACHE_DRIVER=array
-CACHE_PREFIX=
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index dc2d6941..07e3ec99 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -30,6 +30,7 @@
     <inspection_tool class="PhpExpressionResultUnusedInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpIncludeInspection" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="PhpSignatureMismatchDuringInheritanceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="PhpUnnecessaryFullyQualifiedNameInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
     <inspection_tool class="SecurityAdvisoriesInspection" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="optionConfiguration">
         <list>
diff --git a/.travis/deploy_script.sh b/.travis/deploy_script.sh
index c6fcf9b6..9c237bd4 100755
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -19,7 +19,6 @@ if [ "$TRAVIS" = "true" ]; then
     rm -rf .idea phpvms.iml .travis .dpl
     rm -rf .phpstorm.meta.php _ide_helper.php
     php artisan version:show --format compact --suppress-app-name > VERSION
-    mv .env.dev.example .env
 
     echo "creating tarball"
     cd /tmp
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index d8061931..660a0f8a 100755
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -25,6 +25,7 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups = [
         'web' => [
+            \App\Http\Middleware\InstalledCheck::class,
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
diff --git a/app/Http/Middleware/InstalledCheck.php b/app/Http/Middleware/InstalledCheck.php
new file mode 100644
index 00000000..20764fc9
--- /dev/null
+++ b/app/Http/Middleware/InstalledCheck.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Handle the authentication for the API layer
+ */
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class InstalledCheck
+{
+    /**
+     * Check the app.key to see whether we're installed or not
+     * 
+     */
+    public function handle($request, Closure $next)
+    {
+        if (config('app.key') === 'NOT_INSTALLED') {
+            return view('system.errors.not_installed');
+        }
+
+        return $next($request);
+    }
+}
diff --git a/config/app.php b/config/app.php
index 8ba5a6a4..e929fa06 100755
--- a/config/app.php
+++ b/config/app.php
@@ -12,7 +12,7 @@ return [
     'locale' => env('APP_LOCALE', 'en'),
     'fallback_locale' => 'en',
 
-    'key' => env('APP_KEY'),
+    'key' => env('APP_KEY', 'NOT_INSTALLED'),
     'cipher' => 'AES-256-CBC',
 
     'log' => env('APP_LOG', 'daily'),