Update and clean-up licence information
Merge pull request #18 from davidtrem/licence

Update and clean-up licence information