minor updates fixing some issues with conditionals
Merge branch 'master' of https://github.com/themachinist/DiscourseSkin