Merge branch 'master' into cv

README.md

@@ -1,7 +1,7 @@
-sculpin-minimal
-===============
+oliverdavies.co.uk
+==================
 
-A minimal installation of [Sculpin](http://sculpin.io).
+The source code for <http://www.oliverdavies.co.uk>. Built with [Sculpin](http://sculpin.io).
 
 Build
 -----
@@ -17,4 +17,4 @@ Your newly generated clone of the site is now accessible at `http://localhost:80
 
     curl -O https://download.sculpin.io/sculpin.phar
     php sculpin.phar install
-    php sculpin.phar generate --watch --server
+    php sculpin.phar generate --watch --server

source/_posts/2014-11-27-pantheon-settings-files.md

@@ -42,9 +42,14 @@ My alternative solution to this is to include an environment-specific settings f
 To do this, add the following code to the bottom of settings.php:
 
 ~~~php
-// If using Pantheon, include an environment-specific settings file, for example
-// settings.dev.php, if one exists.
 if (isset($_SERVER['PANTHEON_ENVIRONMENT'])) {
+  if ($_SERVER['PANTHEON_ENVIRONMENT'] != 'live') {
+    // You can still add things here, for example to apply to all sites apart
+    // from production. Mail reroutes, caching settings etc.
+  }
+
+  // Include an environment-specific settings file, for example
+  // settings.dev.php, if one exists.
   $environment_settings = __DIR__ . '/settings.' .  $_SERVER['PANTHEON_ENVIRONMENT'] . '.php';
   if (file_exists($environment_settings)) {
     include $environment_settings;