Squashed version of @noisesmith's irclj version update
Merge remote-tracking branch 'amalloy/update-2' into clean-update
addressing comments in the pr review