Some renaming as was mentioned on the mailinglist.

Also, removed the firmware-free option because that firmware is already in the kernel package and thus causing collisions otherwise.

svn path=/nixos/trunk/; revision=31527