Switched to Apache licensing
Merge pull request #314 from SandyWalsh/apache

Switched to Apache licensing