minor
strict versioning
Merge remote-tracking branch 'origin/master' into browserify

Conflicts:
	package.json