Split installation of rpi-update and raspi-config in separate invocations.

Also added a 'apt-get -f install' in case something went wrong in the
hope that it may be fixed then.