Tidying up for switch to 2.0a1
Now Java 7 instead of 8

Dropping JavaFX for sound (some time ago actually) meant 8 was no longer
needed