Tidying and some dependency pushing.

Change-Id: Ic14615537aa544095733785a983b79556c8f2177
Reviewed-on: http://gerrit.dmdirc.com/3021
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>