JSHint trivial fixes #81
fix 'make check'
trailing whitespace
Merge remote-tracking branch 'upstream/master'

Conflicts: (using theirs)
	lib/json.js