Putting YAML header in LICENSE
Building tool to check glossary entries
Ignoring 'tmp' directory when building site
Fixing typo in reference to glossary entry
Updating glossary tool and glossary entries
Filling in glossary entries
Only two bootcamps ever included instructor bios and pictures in their homepages, and it would be better in any case to come up with a way to link to the team.html page on the main Software Carpentry website so that we don't have to maintain two parallel copies of this material.  The same is true of sponsoring organizations and badges.
Filling in another 40-odd glossary entries
Merge branch 'master' of github.com:swcarpentry/bc into checking-glossary
Merge pull request #190 from gvwilson/checking-glossary

First version of glossary.
Merge pull request #189 from gvwilson/removing-instructors-orgs-badges

Removing includes and images for instructors, orgs, and badges (which were almost never used).
Merge branch 'master' of github.com:swcarpentry/bc
Merge branch 'master' of github.com:swcarpentry/bc
Merge branch 'checking-glossary'
Resolving conflict in Makefile (two new targets added)