Some rubocop'ing.
Better line formatting.
Merge branch 'master' of github.com:ibrahima/znclogviewer
Fix merge derp.