Fixed license issues from last commit. 

All CC BY-NC-SA, with Commercial rights vesting in original poster.