Merge branch 'task/update-ruby' into develop

* task/update-ruby:
  Update to Ruby 2.1.0
Merge branch 'master' into develop

* master:
  New blog article
  New blog post
  Add photos to blog articles (cherry picked from commit 47d98b74b53816a7fa38e566bdc2de0ea3ad4510)
Merge branch 'master' into develop

* master:
  Rename "Swami, Snake, Anger" to "Moderating Anger". Add an alias to redirect to the new page from the old address.
  Change markdown processor form RedCarpet to Kramdown so that a class can be specified on an image.
  Add middelman-alias extension to support redirects
  Change image in blog post
Merge branch 'master' into develop

* master:
  Use rake rather that bash scripts to deploy
  Add configuration for the deploy extension.
  Add extension middleman-deploy
Stop deprecation warning from i18n gem by opting for the future locale checking behaviour
Add task descriptions to rakefile.
Hmmm. I'd checked in a merge conflict
Change the default rake task to deploy to test rather than to production.
Ignore .cache folder.
Add images for Genevieve Watters.
Add profile page for for Genevieve.
Activate livereload
Add the bootstrap-sass gem.
User jquery-middleman gem to provide jquery.
Project files updated after Intellij update.
Add Genevieve's blurb.
Add Genevieve's qualifications
Go back to ruby 2.0.
Stop deprecation warning from i18n gem by opting for the future locale checking behaviour
Add task descriptions to rakefile.