Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Changing singular to plural
  Blog post from Tiziano Zito about workshop at GeoSim
  Tiziano Zito
  Stephen Turner's writeup of the UVa workshop
  More badges
  Updating locations of instructors
  Adding missing image
  Blog post about why programming really matters
  Blog post about D-RUG
  Patching broken workshop repository
  Adding users group blog post
  Dan MacLean is now an instructor

adding in upstream changes
Merge branch 'master' of https://github.com/PBarmby/site
Added info from TG.

* 'master' of https://github.com/PBarmby/site:
  Edited 2014-10-31 blogpost, SQL lesson