Merge branch 'master' of github.com:turtl/js
fixing stupid grammar error
Merge branch 'master' into sjcl
Merge remote-tracking branch 'origin/sjcl' into sjcl