Getting rid of /media
Merge branch 'stage' into media

Conflicts:
	repositories/gentoo.conf
	repositories/holliday.conf