Updated readme and licensing info.
Merge branch 'docs' into develop
Merge branch 'develop'