Merge pull request #111 from csmith/master

Tidy up a load of com.dmdirc classes.
Change optionals.