Merge branch 'master' into feature/talks

source/blog.html

@@ -3,9 +3,9 @@ layout: default
 title: Blog
 generator: pagination
 pagination:
-  max_per_page: 10
+    max_per_page: 10
 use:
-  - posts
+    - posts
 ---
 {% block body_classes %}page--blog page--blog__list{% endblock %}
 

source/index.md

@@ -21,13 +21,20 @@ meta:
 
 Hi, I'm Oliver Davies, a Web Developer and System Administrator based in Newport, South Wales. I specialise in PHP
 development with <a href="{{ site.drupalorg.nice }}">Drupal</a> and <a href="http://sculpin.io">Sculpin</a>, and Linux
-system administration. I’m also currently learning Symfony2 framework and Silex.
+system administration. I’m also currently learning Symfony2 framework and Silex. You can follow me on
+<a href="{{ site.twitter.url }}">Twitter</a> and <a href="{{ site.linkedin.url }}">LinkedIn</a>, and you can view my
+code on <a href="{{ site.drupalorg.url }}/track/code">Drupal.org</a> and
+<a href="{{ site.github.url }}?tab=activity">GitHub</a>.
+
+## Work
 
 I’m currently a Senior Developer at [Microserve](https://microserve.io) - a specialist Drupal development agency based
 in Bristol. I previously worked for the [Drupal Association](https://assoc.drupal.org), and for other UK agencies such
 as [Precedent](http://precedent.com) and [Nomensa](http://www.nomensa.com), in permanent and contract positions. I still
 occasionally work on freelance projects in my spare time - please [get in touch](/contact/) for any more information.
 
+## Contribution
+
 I'm a contributor to <a href="http://cgit.drupalcode.org/drupal/log/?h=7.x&qt=grep&q={{ site.drupalorg.name }}">Drupal
 7</a> and <a href="http://cgit.drupalcode.org/drupal/log/?h=8.0.x&qt=grep&q={{ site.drupalorg.name }}">Drupal 8</a>
 core, as well as to other open-source projects including [COD](http://usecod.io) (the conference organising
@@ -42,12 +49,10 @@ sprints, DrupalCamps and DrupalCons, and have helped several new contributors to
 I'm also the [Git Documentation Maintainer](https://www.drupal.org/node/2248627#comment-8887789) for the Drupal project,
 and a provisional member of the [Drupal Security team](https://www.drupal.org/security-team).
 
+## Community
+
 I organise Drupal user group events such as talk nights and code sprints in <a href="{{ site.meetups.swdug.url }}">South
 Wales</a> and <a href="{{ site.meetups.drupalbristol.url }}">Bristol</a>, and am a founding
 [DrupalCamp Bristol](http://2015.drupalcampbristol.co.uk) organising committee member. I also regularly attend and speak
 at other meetups and conferences related to Drupal, PHP, Linux, DevOps, and web deveopment and accessibility.
-
-You can follow me on <a href="{{ site.twitter.url }}">Twitter</a> and <a href="{{ site.linkedin.url }}">LinkedIn</a>,
-and you can view my code on <a href="{{ site.drupalorg.url }}/track/code">Drupal.org</a> and
-<a href="{{ site.github.url }}?tab=activity">GitHub</a>.
 {% endblock %}