diff --git a/.gitignore b/.gitignore
index 4487fdf7..01cc05ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,12 +15,13 @@ doc/
 *~
 .project
 .DS_Store
+.ruby-*
 
 # Ignore files with passwords etc (except sample and model files)
-secret*
+/config/secret.yml
 !secret.rb
 !secret_token.rb
-!secret*.example
+!secret.sample.yml
 
 # Ignore resource files
 /public/resources/*/*.*
@@ -30,4 +31,4 @@ secret*
 trial
 
 * Ignore coverage
-coverage
\ No newline at end of file
+coverage
diff --git a/app/assets/images/rails.png b/app/assets/images/rails.png
deleted file mode 100644
index d5edc04e..00000000
Binary files a/app/assets/images/rails.png and /dev/null differ
diff --git a/app/assets/images/static/debug-bg.png b/app/assets/images/static/debug-bg.png
new file mode 100644
index 00000000..a17f86e1
Binary files /dev/null and b/app/assets/images/static/debug-bg.png differ
diff --git a/app/models/secret.rb b/app/models/secret.rb
index 9f1fe538..d9d6c438 100644
--- a/app/models/secret.rb
+++ b/app/models/secret.rb
@@ -1,4 +1,8 @@
 class Secret < Settingslogic
-  source "#{Rails.root}/config/secret.yml"
+  secret_file = "#{ Rails.root }/config/secret.yml"
+  secret_sample_file = "#{ Rails.root }/config/secret.sample.yml"
+  source_file = (File.exists? secret_file) ? secret_file : secret_sample_file
+
+  source source_file
   namespace Rails.env
 end
diff --git a/app/models/settings.rb b/app/models/settings.rb
index 67265953..28e3bb00 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -1,4 +1,4 @@
 class Settings < Settingslogic
-  source "#{Rails.root}/config/nembrot.yml"
+  source "#{ Rails.root }/config/settings.yml"
   namespace Rails.env
 end
diff --git a/config/html5_rails.yml b/config/html5_rails.yml
deleted file mode 100644
index 5e742cbe..00000000
--- a/config/html5_rails.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file stores config values that html5-rails uses
-# to render various code blocks and features.
-# (i.e. Google Analytics)
-#
-# Leaving a value blank will result in that code block
-# or feature not rendering.
-#
-# You can also define any key/value pair in you ENV and
-# it will take precidence over the yml value.
-# e.g. ENV['google_account_id'] || yml[:google_account_id]
-
-defaults: &defaults
-  :google_account_id: ""  # Google Analytics
-  :google_api_key:    ""  # Google APIs
-
-:development:
-  <<: *defaults
-
-:test:
-  <<: *defaults
-
-:staging:
-  <<: *defaults
-
-:production:
-  <<: *defaults
diff --git a/config/secret.yml b/config/secret.sample.yml
similarity index 100%
rename from config/secret.yml
rename to config/secret.sample.yml
diff --git a/config/nembrot.yml b/config/settings.yml
similarity index 100%
rename from config/nembrot.yml
rename to config/settings.yml