remove package.json (we're not building an NPM module here
Merge branch '1.0'

Conflicts:
	package.json