Logicat Bacon fixes and safety hat
Merge branch 'ed-unstable' of https://github.com/eternaldensity/Sandcastle-Builder into ed-unstable