From: Ian McWilliam <i.mcwilliam@uws.edu.au>
* All-around clean-up. * Fix licensing information. Once upon a time okayed by maintainer.