Clarified a few things in the licence and readme files, and got ready to move over to Eclipse.
Merge remote-tracking branch 'origin/master'
Merged a remote branch with the correct master - someone diverged and split the branches whilst incorrectly submitting