Add 'Software Carpentry' to title by default, instead of *just* the venue name
Update bootcamp.html

* page.title isn't a thing for the bootcamp index, so remove the branching
* add whitespace around the mdash
Changed em-dash to a colon as discussed
Merge pull request #361 from embray/title

Add 'Software Carpentry' to title by default...
Fix links to glossary

@r-gaia-cs broke some links with #394. This fix this links.

~~~
$ for i in $(grep -rl '../../../gloss.html' novice)
do sed -i 's@../../../gloss@../../gloss@' $i
done
$ grep -re '../../../gloss.html' novice
$ grep -re '../../../gloss.html' intermediate
~~~

Thanks to @lexnederbragt.
Merge pull request #407 from r-gaia-cs/fix-link-gloss2

Fix links to glossary