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+
Updating staffing page
Merge branch 'master' of github.com:swcarpentry/website
Merge branch 'master' of github.com:gvwilson/website