Merge branch 'source' into use-bulma

assets/sass/components/_badges.sass

@@ -2,4 +2,14 @@
     margin: 0 auto 10px
 
 .badges img
+    height: auto
     max-width: 100%
+
+.acquia-badges
+    border-collapse: collapse
+    display: table
+
+    .badge
+        background: none
+        display: table-cell
+        padding: 0

source/_includes/badges.html.twig

@@ -7,18 +7,20 @@
         />
     </a>
 
-    <div class="is-flex align-items-center">
+    <div class="acquia-badges">
-        <img
+        <div class="badge">
-            src="{{ site.images_url }}/assets/images/badges/acquia-d8-developer.png"
+            <img
-            alt="Acquia Certified Developer - Drupal 8 Exam Badge"
+                src="{{ site.images_url }}/assets/images/badges/acquia-d8-developer.png"
-            class="is-2"
+                alt="Acquia Certified Developer - Drupal 8 Exam Badge"
-        />
+            />
+        </div>
 
-        <img
+        <div class="badge">
-            src="{{ site.images_url }}/assets/images/badges/acquia-d8-back-end.png"
+            <img
-            alt="Acquia Certified Back End Specialist - Drupal 8 Exam Badge"
+                src="{{ site.images_url }}/assets/images/badges/acquia-d8-back-end.png"
-            class="is-2"
+                alt="Acquia Certified Back End Specialist - Drupal 8 Exam Badge"
-        />
+            />
+        </div>
     </div>
 
     <a href="http://conference.phpnw.org.uk/phpnw17" class="is-block">

source/index.md

@@ -19,7 +19,7 @@ redirect:
 
 My name is Oliver Davies (aka [opdavies][1]) - a full-stack Web Developer and System Administrator based in Wales, UK.
 
-I specialise in open-source PHP technologies. I’m an [Acquia certified Drupal Developer][41] but also work with Symfony, Silex, Laravel and Sculpin. I’m a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][20], former Developer at the [{{ site.companies.drupal_association.name }}][39], part-time freelancer, open source contributor and advocate, mentor and conference speaker.
+I specialise in open-source PHP technologies. I primarily work with Drupal and am an [Acquia certified Drupal Developer][41] but also work with Symfony, Silex, Laravel and Sculpin. I’m a {{ site.work.role }} at [{{ site.companies[site.work.company].name }}][20], former Developer at the [{{ site.companies.drupal_association.name }}][39], part-time freelancer, open source contributor and advocate, mentor and conference speaker.
 
 I’m a webmaster and documentation maintainer for [Drupal.org][42], and a provisional member of the [Drupal Security team][14]. [I speak at various user groups and conferences][40], and co-organise the [Drupal Bristol user group][15], [PHPSW][17] and [DrupalCamp Bristol][18].
 

source/speaker-info.md

@@ -11,9 +11,9 @@ use: [posts]
 
 ## Bio
 
-[Oliver Davies][1] ([@{{ site.twitter.name }}][2]) has been building websites since 2007, specialising in PHP and Drupal since 2008, and more recently also working with Symfony, Silex, Laravel and Sculpin. He is a {{ site.work.role }} at [{{ company.name }}][0], a Drupal core contributor and mentor, and an open source and contribution advocate.
+[Oliver Davies][1] ([@{{ site.twitter.name }}][2]) has been building websites and web applications since 2007 - primarily with Drupal, though more recently also with Symfony, Silex, Laravel and Sculpin. He is a {{ site.work.role }} at [{{ company.name }}][0], a Drupal core contributor and mentor, and an open source and contribution advocate.
 
-He regularly blogs and gives talks about web development and systems administration, maintains and contributes to various open source projects, and co-organises the Drupal Bristol and PHPSW meetups and DrupalCamp Bristol conference.
+He regularly blogs and gives talks about web development and systems administration, maintains and contributes to various open source projects, and co-organises DrupalCamp Bristol as well as the Drupal Bristol and PHPSW user groups.
 
 ## Photo
 
@@ -29,14 +29,11 @@ Here are some of the events that I’ve spoken at:
 - PHP South Coast 2016
 - DrupalCamp Bristol 2016
 - Nomad PHP
+<!-- - PHP North West 2017 -->
 
 ## Videos
 
-Here are some videos of my previous talks:
+Here is a YouTube playlist of some of my previous talks: <http://bit.ly/opdavies-talk-videos>.
-
-- <https://www.youtube.com/watch?v=aN53arCKZAU>
-- <https://www.youtube.com/watch?v=qO_Wh5WE3VA>
-- <https://www.youtube.com/watch?v=Yi_FPI3xHwc>
 
 [0]: {{company.url}}
 [1]: {{site.url}}