Misc updates
Merge branch 'master' of https://github.com/geraintluff/jsonary

Conflicts:
	jsonary/utils.js