total rewrite based on the recent rewrite, now much better, concise, punchy, bold, clear!
simplified bolding to cover whole thesis sentence
that matches our new style guidelines
Fledgeling merge support for Wiki

Closes GH-164