diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..053c27d
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'github-pages'
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..a5e7093
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,129 @@
+GEM
+ remote: https://rubygems.org/
+ specs:
+ RedCloth (4.2.9)
+ activesupport (4.2.5.1)
+ i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
+ minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
+ tzinfo (~> 1.1)
+ addressable (2.3.8)
+ coffee-script (2.4.1)
+ coffee-script-source
+ execjs
+ coffee-script-source (1.10.0)
+ colorator (0.1)
+ ethon (0.8.1)
+ ffi (>= 1.3.0)
+ execjs (2.6.0)
+ faraday (0.9.2)
+ multipart-post (>= 1.2, < 3)
+ ffi (1.9.10)
+ gemoji (2.1.0)
+ github-pages (48)
+ RedCloth (= 4.2.9)
+ github-pages-health-check (= 0.6.1)
+ jekyll (= 3.0.3)
+ jekyll-coffeescript (= 1.0.1)
+ jekyll-feed (= 0.3.1)
+ jekyll-gist (= 1.4.0)
+ jekyll-mentions (= 1.0.0)
+ jekyll-paginate (= 1.1.0)
+ jekyll-redirect-from (= 0.9.1)
+ jekyll-sass-converter (= 1.3.0)
+ jekyll-seo-tag (= 1.0.0)
+ jekyll-sitemap (= 0.10.0)
+ jekyll-textile-converter (= 0.1.0)
+ jemoji (= 0.5.1)
+ kramdown (= 1.9.0)
+ liquid (= 3.0.6)
+ mercenary (~> 0.3)
+ rdiscount (= 2.1.8)
+ redcarpet (= 3.3.3)
+ rouge (= 1.10.1)
+ terminal-table (~> 1.4)
+ github-pages-health-check (0.6.1)
+ addressable (~> 2.3)
+ net-dns (~> 0.8)
+ public_suffix (~> 1.4)
+ typhoeus (~> 0.7)
+ html-pipeline (2.3.0)
+ activesupport (>= 2, < 5)
+ nokogiri (>= 1.4)
+ i18n (0.7.0)
+ jekyll (3.0.3)
+ colorator (~> 0.1)
+ jekyll-sass-converter (~> 1.0)
+ jekyll-watch (~> 1.1)
+ kramdown (~> 1.3)
+ liquid (~> 3.0)
+ mercenary (~> 0.3.3)
+ rouge (~> 1.7)
+ safe_yaml (~> 1.0)
+ jekyll-coffeescript (1.0.1)
+ coffee-script (~> 2.2)
+ jekyll-feed (0.3.1)
+ jekyll-gist (1.4.0)
+ octokit (~> 4.2)
+ jekyll-mentions (1.0.0)
+ html-pipeline (~> 2.2)
+ jekyll (~> 3.0)
+ jekyll-paginate (1.1.0)
+ jekyll-redirect-from (0.9.1)
+ jekyll (>= 2.0)
+ jekyll-sass-converter (1.3.0)
+ sass (~> 3.2)
+ jekyll-seo-tag (1.0.0)
+ jekyll (>= 2.0)
+ jekyll-sitemap (0.10.0)
+ jekyll-textile-converter (0.1.0)
+ RedCloth (~> 4.0)
+ jekyll-watch (1.3.1)
+ listen (~> 3.0)
+ jemoji (0.5.1)
+ gemoji (~> 2.0)
+ html-pipeline (~> 2.2)
+ jekyll (>= 2.0)
+ json (1.8.3)
+ kramdown (1.9.0)
+ liquid (3.0.6)
+ listen (3.0.6)
+ rb-fsevent (>= 0.9.3)
+ rb-inotify (>= 0.9.7)
+ mercenary (0.3.5)
+ mini_portile2 (2.0.0)
+ minitest (5.8.4)
+ multipart-post (2.0.0)
+ net-dns (0.8.0)
+ nokogiri (1.6.7.2)
+ mini_portile2 (~> 2.0.0.rc2)
+ octokit (4.2.0)
+ sawyer (~> 0.6.0, >= 0.5.3)
+ public_suffix (1.5.3)
+ rb-fsevent (0.9.7)
+ rb-inotify (0.9.7)
+ ffi (>= 0.5.0)
+ rdiscount (2.1.8)
+ redcarpet (3.3.3)
+ rouge (1.10.1)
+ safe_yaml (1.0.4)
+ sass (3.4.21)
+ sawyer (0.6.0)
+ addressable (~> 2.3.5)
+ faraday (~> 0.8, < 0.10)
+ terminal-table (1.5.2)
+ thread_safe (0.3.5)
+ typhoeus (0.8.0)
+ ethon (>= 0.8.0)
+ tzinfo (1.2.2)
+ thread_safe (~> 0.1)
+
+PLATFORMS
+ ruby
+
+DEPENDENCIES
+ github-pages
+
+BUNDLED WITH
+ 1.10.6
diff --git a/_config.yml b/_config.yml
index 8f818c5..fc11760 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,5 +1,5 @@
baseurl: /
-highlighter: pygments
+highlighter: rouge
markdown: kramdown
permalink: date
maruku:
@@ -20,3 +20,5 @@ defaults:
sitemap: false
exclude: ['CNAME', 'CONTRIBUTING.md', 'LICENSE', 'README.md', 'pages/example.md']
+
+future: true
diff --git a/_layouts/default.html b/_layouts/default.html
index 2316d50..eace5e4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -15,6 +15,7 @@
+
diff --git a/_layouts/page.html b/_layouts/page.html
index c490675..97f3162 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -15,6 +15,7 @@
+
diff --git a/_posts/01-05-01-Windows-Setup.md b/_posts/01-05-01-Windows-Setup.md
index 90c81c1..e916c91 100644
--- a/_posts/01-05-01-Windows-Setup.md
+++ b/_posts/01-05-01-Windows-Setup.md
@@ -9,21 +9,27 @@ You can download the binaries from [windows.php.net/download][php-downloads]. Af
For learning and local development you can use the built in webserver with PHP 5.4+ so you don't need to worry about
configuring it. If you would like an "all-in-one" which includes a full-blown webserver and MySQL too then tools such
-as the [Web Platform Installer][wpi], [XAMPP][xampp], [EasyPHP][easyphp] and [WAMP][wamp] will
+as the [Web Platform Installer][wpi], [XAMPP][xampp], [EasyPHP][easyphp], [OpenServer][openserver] and [WAMP][wamp] will
help get a Windows development environment up and running fast. That said, these tools will be a little different from
production so be careful of environment differences if you are working on Windows and deploying to Linux.
-
+
If you need to run your production system on Windows then IIS7 will give you the most stable and best performance. You
can use [phpmanager][phpmanager] (a GUI plugin for IIS7) to make configuring and managing PHP simple. IIS7 comes with
FastCGI built in and ready to go, you just need to configure PHP as a handler. For support and additional resources
there is a [dedicated area on iis.net][php-iis] for PHP.
-
-
-[php-downloads]: http://windows.php.net/download/
-[windows-path]: http://www.windows-commandline.com/set-path-command-line/
-[wpi]: http://www.microsoft.com/web/downloads/platform.aspx
-[xampp]: http://www.apachefriends.org/en/xampp.html
-[easyphp]: http://www.easyphp.org/
-[wamp]: http://www.wampserver.com/en/
-[phpmanager]: http://phpmanager.codeplex.com/
-[php-iis]: http://php.iis.net/
+
+Generally running your application on different environment in development and production can lead to strange bugs popping up when you go
+live. If you are developing on Windows and deploying to Linux (or anything non-Windows) then you should consider using a [Virtual Machine](/#virtualization_title).
+
+Chris Tankersley has a very helpful blog post on what tools he uses to do [PHP development using Windows][windows-tools].
+
+[easyphp]: http://www.easyphp.org/
+[phpmanager]: http://phpmanager.codeplex.com/
+[openserver]: http://open-server.ru/
+[wamp]: http://www.wampserver.com/en/
+[php-downloads]: http://windows.php.net/download/
+[php-iis]: http://php.iis.net/
+[windows-path]: http://www.windows-commandline.com/set-path-command-line/
+[windows-tools]: http://ctankersley.com/2015/07/01/developing-on-windows/
+[wpi]: http://www.microsoft.com/web/downloads/platform.aspx
+[xampp]: http://www.apachefriends.org/en/xampp.html
diff --git a/_posts/10-05-01-Configuration-Files.md b/_posts/10-05-01-Configuration-Files.md
index e864bda..afb7c0b 100644
--- a/_posts/10-05-01-Configuration-Files.md
+++ b/_posts/10-05-01-Configuration-Files.md
@@ -13,4 +13,5 @@ via the file system.
- If you must store your configuration files in the document root, name the files with a `.php` extension. This ensures
that, even if the script is accessed directly, it will not be output as plain text.
- Information in configuration files should be protected accordingly, either through encryption or group/user file
-system permissions
\ No newline at end of file
+system permissions.
+- It is a good idea to ensure that you do not commit configuration files containing sensitive information eg passwords or API tokens to source control.
diff --git a/_posts/16-05-01-PHP-PaaS-Providers.md b/_posts/16-05-01-PHP-PaaS-Providers.md
index 26f6cfa..793bc39 100644
--- a/_posts/16-05-01-PHP-PaaS-Providers.md
+++ b/_posts/16-05-01-PHP-PaaS-Providers.md
@@ -17,3 +17,4 @@ anchor: php_paas_providers
* [Windows Azure](http://www.windowsazure.com/)
* [Google App Engine](https://developers.google.com/appengine/docs/php/gettingstarted/)
* [Jelastic](http://jelastic.com/)
+* [Platform.sh](https://platform.sh/)
\ No newline at end of file