sdf
Merge branch 'master' of https://github.com/jeroenooms/JSONlite
cleanup

Merge branch 'master' of https://github.com/jeroenooms/JSONlite

Conflicts:
	vignettes/toJSON-conventions.Rnw