Rename local: prefix to storage:
Merge branch 'stage' into prime

Conflicts:
	repositories/gentoo.conf