Revert "Make linux work again."

This reverts commit 60b2ab917e.

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

.idea/modules.xml

@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/DMDirc.iml" filepath="$PROJECT_DIR$/DMDirc.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/activewindow/activewindow.iml" filepath="$PROJECT_DIR$/modules/plugins/activewindow/activewindow.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/audio/audio.iml" filepath="$PROJECT_DIR$/modules/plugins/audio/audio.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/calc/calc.iml" filepath="$PROJECT_DIR$/modules/plugins/calc/calc.iml" />
@@ -11,6 +10,7 @@
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/dcc/dcc.iml" filepath="$PROJECT_DIR$/modules/plugins/dcc/dcc.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/dcop/dcop.iml" filepath="$PROJECT_DIR$/modules/plugins/dcop/dcop.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/debug/debug.iml" filepath="$PROJECT_DIR$/modules/plugins/debug/debug.iml" />
+      <module fileurl="file://$PROJECT_DIR$/dmdirc.iml" filepath="$PROJECT_DIR$/dmdirc.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/dns/dns.iml" filepath="$PROJECT_DIR$/modules/plugins/dns/dns.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/exec/exec.iml" filepath="$PROJECT_DIR$/modules/plugins/exec/exec.iml" />
       <module fileurl="file://$PROJECT_DIR$/modules/plugins/freedesktop_notifications/freedesktop_notifications.iml" filepath="$PROJECT_DIR$/modules/plugins/freedesktop_notifications/freedesktop_notifications.iml" />

.idea/parser.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":modules:parser" external.linked.project.path="$MODULE_DIR$/modules/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="DMDirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":modules:parser" external.linked.project.path="$MODULE_DIR$/modules/parser" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="dmdirc.modules" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/modules/parser/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/modules/parser/build/classes/test" />

DMDirc.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="DMDirc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="dmdirc" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/classes/main" />
     <output-test url="file://$MODULE_DIR$/build/classes/test" />
@@ -17,6 +17,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="util" exported="" />
     <orderEntry type="module" module-name="parser" exported="" />
     <orderEntry type="library" exported="" name="Gradle: com.squareup.dagger:dagger:1.2.1" level="project" />
@@ -33,7 +34,6 @@
     <orderEntry type="library" exported="" name="Gradle: com.squareup:javawriter:2.3.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12-beta-1" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.mockito:mockito-all:1.9.5" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>