Updating package.json and adding license text and a .gitignore file
Merge branch 'upstream'

Conflicts:
	.gitignore