Update to new Org URLs
Use the simpler `license` property.
Use the new oragnization URL.
Merge pull request #499 from XhmikosR/patch-2

Use the simpler `license` property and update the repo URL