Squashed version of @noisesmith's irclj version update

This is the same diff as #102, but with the weird self-conflicting history all squashed out into a single commit.
Fair point, just a refactoring artifact I think. Should be taken out of course.