Update mctavish.ej.html
updated self
Merge pull request #359 from snacktavish/master

Update mctavish.ej.html
Merge pull request #360 from scopatz/scopatz-update

updated scopatz
Adding new instructors
Adding and updating more instructors
Adding two more bootcamps
Merge pull request #362 from gvwilson/adding-aims-and-ethz

Adding two more bootcamps
Update bio information for J. Shelton
Merge pull request #363 from sheltoneer/shelton-update

Update bio information for J. Shelton
Another new instructor
Remi Emonet
Updating Adina's bio
Karthik Ram's post about the rOpenSci hackathon
Merge pull request #364 from gvwilson/blog-ropensci-hackathon

Karthik Ram's post about the rOpenSci hackathon
Merge branch 'master' of github.com:swcarpentry/site into adding-new-instructors
Addring Luis Pedro Coelho
Adding Denis Haine
Adding Daniel Hocking
Adding Joshua Adelman