Merge branch 'master' of github.com:swcarpentry/site
Merge branch 'changing-bootcamp-to-workshop'
Merge branch 'master' of github.com:swcarpentry/site
Adding a note about Trevor and Ethan maintaining the Windows installer