diceware support

Conflicts:
	cache.manifest