Licence consistency

ENSURE THAT #6 and #7 HAVE BEEN REVIEWED AND MERGED PRIOR TO MERGING THIS.