Bump package.json version to 1.2.0

A 1.0.0 tag was added 6 months ago, but we never updated package.json.  Bump the current master to 1.2.0 reflecting the API jumps since then.
Merge branch 'master'

Fix package.json versioning

Conflicts:
	package.json