Adding link to Google+, and using defined URLs for Facebook and Google+
Converting 'workshop' to 'boot camp'
Merge pull request #341 from gvwilson/workshop

Replacing 'workshop' with 'boot camp' in several places.
Adding Ian Langmore and Ariel Rokem to the team
Emily Jane McTavish added to 'team' list
Adding Lex Nederbragt to the team
Merge pull request #340 from gvwilson/team

Adding four more people to about/team.html and deleting the Index section.
Merge remote-tracking branch 'gvwilson/social-media'

* gvwilson/social-media:
  Adding link to Google+, and using defined URLs for Facebook and Google+
Adding Stephen McGough
Elizabeth Patitsas comments on python.html exercises
After conversation with Jon Udell, removing XML stuff from web chapter:
will use JSON for all examples instead.  This will free up space to talk
about other things (e.g., Google Fusion tables).
Command to display history graphically in Git
Adding an option to echo paths to the badge creation script
Issuing badges for new instructors
Updated Soton information with current syllabus and corrected institution name typo
Merge pull request #348 from mikej888/master

Updates to Soton boot camp page.
Merge pull request #343 from gvwilson/team

Adding Stephen McGough to the team.
setup/terminal.html: Remove Cygwin reference from OS X instructions

Reported-by: Amy Brown <amyrhoda@gmail.com>
Blog posts
Blogging about the first round at LBL (and cleaning up some mistakes I made while trying to rebase things while tired)