Converting 'workshop' to 'boot camp'
Added registration tag and Note
Added page for Soton
Merge pull request #339 from mikej888/master

Updates to upcoming bootcamps
Merge branch 'master' of github.com:swcarpentry/website into workshop
Merge branch 'workshop'