diff --git a/README.md b/README.md
index 25fc6a07a7..68de0242be 100644
--- a/README.md
+++ b/README.md
@@ -47,12 +47,14 @@ Forgetting to do this can mean your DB might end up out of sync with the new fil
 
 #### 2.1) Setup Your Database
 
+Copy the example database config `app/config/local/database.example.php` to `database.php`.
 Update the file `app/config/local/database.php` with your database name and credentials.
 
     vi app/config/local/database.php
 
 #### 2.2) Setup Mail Settings
 
+Copy the example mail config `app/config/local/database.example.php` to `database.php`.
 Update the file `app/config/local/mail.php` with your mail settings.
 
     vi app/config/local/mail.php
@@ -61,7 +63,13 @@ This will be used to send emails to your users, when they register and they requ
 
 #### 2.3) Adjust the application settings.
 
-Update the file `app/config/local/app.php` with your setting URL settings.  You should also change your secret key here -- if you prefer to have your key randomly generated, run the artisan key:generate command from the application root.
+Copy the example app config `app/config/local/app.example.php` to `app.php`.
+
+Update the file `app/config/local/app.php` with your setting URL settings.  
+
+	vi app/config/local/app.php
+
+You should also change your secret key here -- if you prefer to have your key randomly generated, run the artisan key:generate command from the application root.
 
 	php artisan key:generate --env=local
 
diff --git a/app/config/local/.gitignore b/app/config/local/.gitignore
new file mode 100644
index 0000000000..3fbd46353d
--- /dev/null
+++ b/app/config/local/.gitignore
@@ -0,0 +1,3 @@
+app.php
+mail.php
+database.php
diff --git a/app/config/local/app.php b/app/config/local/app.example.php
similarity index 100%
rename from app/config/local/app.php
rename to app/config/local/app.example.php
diff --git a/app/config/local/database.php b/app/config/local/database.example.php
similarity index 100%
rename from app/config/local/database.php
rename to app/config/local/database.example.php
diff --git a/app/config/local/mail.php b/app/config/local/mail.example.php
similarity index 100%
rename from app/config/local/mail.php
rename to app/config/local/mail.example.php
diff --git a/app/config/production/.gitignore b/app/config/production/.gitignore
new file mode 100644
index 0000000000..3fbd46353d
--- /dev/null
+++ b/app/config/production/.gitignore
@@ -0,0 +1,3 @@
+app.php
+mail.php
+database.php
diff --git a/app/config/production/app.php b/app/config/production/app.example.php
similarity index 93%
rename from app/config/production/app.php
rename to app/config/production/app.example.php
index 229d012077..598b272ed3 100644
--- a/app/config/production/app.php
+++ b/app/config/production/app.example.php
@@ -13,7 +13,7 @@ return array(
 	|
 	*/
 
-	'debug' => true,
+	'debug' => false,
 
 	/*
 	|--------------------------------------------------------------------------
@@ -37,7 +37,7 @@ return array(
 	| to a random, 32 character string, otherwise these encrypted strings
 	| will not be safe. Please do this before deploying an application!
 	|
-	| Run a php artisand key:generate --env=production to create a random one
+	| Run a php artisand key:generate --env=staging to create a random one
 	*/
 
 	'key' => 'Change_this_key_or_snipe_will_get_ya',
diff --git a/app/config/production/database.php b/app/config/production/database.example.php
similarity index 100%
rename from app/config/production/database.php
rename to app/config/production/database.example.php
diff --git a/app/config/production/mail.php b/app/config/production/mail.example.php
similarity index 100%
rename from app/config/production/mail.php
rename to app/config/production/mail.example.php
diff --git a/app/config/staging/.gitignore b/app/config/staging/.gitignore
new file mode 100644
index 0000000000..3fbd46353d
--- /dev/null
+++ b/app/config/staging/.gitignore
@@ -0,0 +1,3 @@
+app.php
+mail.php
+database.php
diff --git a/app/config/staging/app.php b/app/config/staging/app.example.php
similarity index 91%
rename from app/config/staging/app.php
rename to app/config/staging/app.example.php
index 57722e1789..44544721d0 100644
--- a/app/config/staging/app.php
+++ b/app/config/staging/app.example.php
@@ -26,7 +26,7 @@ return array(
 	|
 	*/
 
-	'url' => 'http://localhost',
+	'url' => 'http://staging.yourserver.com',
 
 	/*
 	|--------------------------------------------------------------------------
@@ -37,6 +37,7 @@ return array(
 	| to a random, 32 character string, otherwise these encrypted strings
 	| will not be safe. Please do this before deploying an application!
 	|
+	| Run a php artisand key:generate --env=staging to create a random one
 	*/
 
 	'key' => 'Change_this_key_or_snipe_will_get_ya',
diff --git a/app/config/staging/database.php b/app/config/staging/database.example.php
similarity index 100%
rename from app/config/staging/database.php
rename to app/config/staging/database.example.php
diff --git a/app/config/staging/mail.php b/app/config/staging/mail.example.php
similarity index 100%
rename from app/config/staging/mail.php
rename to app/config/staging/mail.example.php