Update License to allow both GPL and CC BY 3.0