Update to work done in DMDirc/Infrastructure.
Merge pull request #2 from greboid/master

Update work work done in DMDirc/Infrastructure.