Fix irc-hero-channels templates.
Minor refactoring
Merge pull request #5 from cnaude/master

merge