Merge remote-tracking branch 'upstream/master' into hacks

Conflicts:
	lib/toy/persistence.rb
	lib/toy/querying.rb
	lib/toy/store.rb