Update the basic packages to install

Conflicts:

	home/andres/install-extras