Merge pull request #118 from jonasfj/cleanup-license

Simplify licensing