Fix some stupidly wrong imports.

Change-Id: Iaa32f068930bee751e17e2f22136e571e5afa081
Reviewed-on: http://gerrit.dmdirc.com/3853
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Remove some duplication, add test deps.

Change-Id: Ia77233d3cace95468258797ac88fef9f4ed317ca
Reviewed-on: http://gerrit.dmdirc.com/3855
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
Add gradle wrapper

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