Fixed some production issues.
Merge branch 'master' of github.com:superlativecode/Bonfire-Comments