Small updates to license and gitignore.
Merge branch 'develop'