Add load_factor and load_factor_variance to flights #352 (#620)

modules/Importer/Resources/views/step1-configure.blade.php

@@ -12,7 +12,7 @@
             <li>The first user's password (admin) will be "admin". Please change it after logging in</li>
             <li>User passwords will be reset and they will need to use "Forgot Password" to reset it</li>
             <li>If you have more than 1000 PIREPs or flights, it's best to use the command-line importer!
-              <a href="http://docs.phpvms.net/setup/importing-from-v2-v5" target="_blank">Click here</a> to
+              <a href="{{ docs_link('importing_legacy') }}" target="_blank">Click here</a> to
               see the documentation of how to use it.
             </li>
             <li><strong>THIS WILL WIPE OUT YOUR EXISTING DATA</strong> - this is required to make sure that things like

modules/Vacentral/Providers/AppServiceProvider.php

@@ -28,7 +28,8 @@ class AppServiceProvider extends ServiceProvider
         ], 'config');
 
         $this->mergeConfigFrom(
-            __DIR__.'/../Config/config.php', 'vacentral'
+            __DIR__.'/../Config/config.php',
+            'vacentral'
         );
     }
 }