diff --git a/config/app.php b/config/app.php
index cfd30445..22316987 100644
--- a/config/app.php
+++ b/config/app.php
@@ -21,7 +21,7 @@ return [
     | any other location as required by the application or its packages.
     */
 
-    'name' => 'My Application',
+    'name' => 'Cachet',
 
     /*
     |--------------------------------------------------------------------------
diff --git a/config/auth.php b/config/auth.php
index 97aef242..a0697fac 100644
--- a/config/auth.php
+++ b/config/auth.php
@@ -76,8 +76,13 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model'  => 'CachetHQ\Cachet\Models\User',
+            'model'  => \CachetHQ\Cachet\Models\User::class,
         ],
+
+        // 'users' => [
+        //     'driver' => 'database',
+        //     'table' => 'users',
+        // ],
     ],
 
     /*
@@ -85,10 +90,6 @@ return [
     | Resetting Passwords
     |--------------------------------------------------------------------------
     |
-    | Here you may set the options for resetting passwords including the view
-    | that is your password reset e-mail. You may also set the name of the
-    | table that maintains all of the reset tokens for your application.
-    |
     | You may specify multiple password reset configurations if you have more
     | than one user table or model in the application and you want to have
     | separate password reset settings based on the specific user types.
@@ -102,7 +103,6 @@ return [
     'passwords' => [
         'users' => [
             'provider' => 'users',
-            'email'    => 'auth.emails.password',
             'table'    => 'password_resets',
             'expire'   => 60,
         ],
diff --git a/config/cache.php b/config/cache.php
index ce53b14c..6a2bae29 100644
--- a/config/cache.php
+++ b/config/cache.php
@@ -10,7 +10,6 @@
  */
 
 return [
-
     /*
     |--------------------------------------------------------------------------
     | Default Cache Store
@@ -20,10 +19,10 @@ return [
     | using this caching library. This connection is used when another is
     | not explicitly specified when executing a given caching function.
     |
+    | Supported: "apc", "array", "database", "file", "memcached", "redis"
+    |
     */
-
     'default' => env('CACHE_DRIVER', 'file'),
-
     /*
     |--------------------------------------------------------------------------
     | Cache Stores
@@ -34,46 +33,45 @@ return [
     | same cache driver to group types of items stored in your caches.
     |
     */
-
     'stores' => [
-
         'apc' => [
             'driver' => 'apc',
         ],
-
         'array' => [
             'driver' => 'array',
         ],
-
         'database' => [
             'driver'     => 'database',
             'table'      => 'cache',
             'connection' => null,
         ],
-
         'file' => [
             'driver' => 'file',
-            'path'   => storage_path('framework/cache'),
+            'path' => storage_path('framework/cache'),
         ],
-
         'memcached' => [
-            'driver'  => 'memcached',
+            'driver'        => 'memcached',
+            'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
+            'sasl'          => [
+                env('MEMCACHED_USERNAME'),
+                env('MEMCACHED_PASSWORD'),
+            ],
+            'options' => [
+                // Memcached::OPT_CONNECT_TIMEOUT  => 2000,
+            ],
             'servers' => [
                 [
-                    'host'   => '127.0.0.1',
-                    'port'   => 11211,
+                    'host'   => env('MEMCACHED_HOST', '127.0.0.1'),
+                    'port'   => env('MEMCACHED_PORT', 11211),
                     'weight' => 100,
                 ],
             ],
         ],
-
         'redis' => [
             'driver'     => 'redis',
             'connection' => 'default',
         ],
-
     ],
-
     /*
     |--------------------------------------------------------------------------
     | Cache Key Prefix
@@ -84,7 +82,5 @@ return [
     | value to get prefixed to all our keys so we can avoid collisions.
     |
     */
-
     'prefix' => 'laravel',
-
 ];
diff --git a/config/services.php b/config/services.php
index f1a4e4c1..c4d0f901 100644
--- a/config/services.php
+++ b/config/services.php
@@ -17,7 +17,7 @@ return [
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, Mandrill, and others. This file provides a sane
+    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
     | default location for this type of information, allowing packages
     | to have a conventional place to find your various credentials.
     |
diff --git a/config/session.php b/config/session.php
index 12f49d0f..dd1c1ead 100644
--- a/config/session.php
+++ b/config/session.php
@@ -94,6 +94,19 @@ return [
 
     'table' => 'sessions',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Session Cache Store
+    |--------------------------------------------------------------------------
+    |
+    | When using the "apc" or "memcached" session drivers, you may specify a
+    | cache store that should be used for these sessions. This value must
+    | correspond with one of the application's configured cache stores.
+    |
+    */
+
+    'store' => null,
+
     /*
     |--------------------------------------------------------------------------
     | Session Sweeping Lottery
@@ -144,7 +157,7 @@ return [
     |
     */
 
-    'domain' => null,
+    'domain' => env('SESSION_DOMAIN', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -157,7 +170,7 @@ return [
     |
     */
 
-    'secure' => false,
+    'secure' => env('SESSION_SECURE_COOKIE', false),
 
     /*
     |--------------------------------------------------------------------------