Stupid cows.

Why is this a default? GO AWAY.
Merge branch 'master' of https://github.com/DMDirc/Infrastructure
Merge pull request #36 from csmith/master

Stupid cows.