More tidying/dependencies/etc.

Change-Id: I828f2ea9980123409a7d33efc787cb3b6d64d441
Reviewed-on: http://gerrit.dmdirc.com/3060
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Even more tidying.

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