Start on 100km blog post
Merge branch 'master' into blog

* master:
  Fixed height on strava embed
  Fixed publish date
  Double waters post
  End of uni post
  Added final year models + programming language updates
  Portfolio call to actions
  Updated contact information
  Removed dead link
  Tidied portfolio image alignment
Merge branch 'master' into blog

* master:
  Minor tweaks
  Minor corrections
Merge branch 'master' into blog

* master:
  Improved navigation
  Fixed open source slide
  Improved slides
  Tabs to Spaces
  Switch on/off hire me
  Moved hire me bar into include file
  Fixed alt text
  Redesigned adventures + photography
  Multi column adventures page layout
  Added master build status
  Mmoved portfolio link
  Added portfolio slide background colour
  Change ... to -->
  Code cleanup and refinement
  Basic content + styles
  Removed old script tag
  Slider implementation
  Removed unessesery tabstops
Merge branch 'master' into blog

* master:
  Fixed logo on Retina MacBook
Vagrant + Ansible working draft
Further work on Vagrant + Ansible
Instructions verified
Finalised article content
Fixed PHP link
Final alterations
Set publish datetime
Start on Give and Tell Challenge post
Merge branch 'master' into blog

* master:
  Master build image updated
  Fixed typo
  Rephrased past 'job' into past tense
  Added Vualto to CV
  Added degree results
  Disabled 'hire me'
  Make use of feed template, remove repetition
  Specified template file for feed files to stop nill template warnings
  Specificy full path for Jekyll::Paginate::Pager
  Fixed image in SSD post
  Spelling correction (thanks @cblunt)
  Merged development environments post from blog branch
  Updated config for Jekyll 2

Conflicts:
	notebook/_posts/2014-05-19-development-environments.md
Continued work on Give and Tell Challenge
Merge branch 'blog' of gitlab.danielgroves.net:daniel-groves-design/danielgroves_net into blog

* 'blog' of gitlab.danielgroves.net:daniel-groves-design/danielgroves_net: (27 commits)
  Set Shutting Down Server Observer publish date
  Server Observer
  Adding Piwik tracking
  Updated about
  Typo
  Filesystem case sensitivity patch
  Update datetime
  File name fixes
  Minor style fixes
  Layour tweaks
  Update page title
  Cover image
  Reprocess images
  Finalise post
  Captions
  Image optimisation
  Photo style adjustments
  All JOGLE images
  Pictures
  First round on pictures
  ...
Merge branch 'blog'

* blog:
  Continued work on Give and Tell Challenge
  Start on Give and Tell Challenge post
  Set publish datetime
  Final alterations
  Fixed PHP link
  Finalised article content
  Instructions verified
  Further work on Vagrant + Ansible
  Vagrant + Ansible working draft
  Start on 100km blog post
Removed redundant post