Short mention of Science Careers article
Merge pull request #541 from gvwilson/blog-science-careers-article

Short mention of Science Careers article
Fixing one-line typo in setup instructions
Added Dhavide Aruliah to metadata and to Salk boot camp.
Merge pull request #542 from amyrbrown/da-salk

Added Dhavide Aruliah to metadata and to Salk boot camp.
Announcing Hack4ac
Added SFU boot camp (and Lynne Williams to metadata)
Added room number
Added Ted Hart to instructors
Created page for Stroud boot camp in September
Merge pull request #543 from amyrbrown/sfu-new

Added SFU boot camp (and Lynne Williams to metadata)
Merge pull request #544 from amyrbrown/new-stroud

Created page for Stroud boot camp in September
Adding link to testimonials to navigation menu
Merge branch 'master' of github.com:swcarpentry/website
about/biblio.html: Fix ' </a>' -> '</a>' typo
Merge branch 'bibliography' (fixes #539)

* bibliography:
  about/biblio.html: Fix ' </a>' -> '</a>' typo
  Added hints, tips, cautionary tales, blogs and humour links
Merge branch 'master' of git://github.com/swcarpentry/website