Clean up the machine configuration and move non-machine specific preferences.

PREFERRED_PROVIDERs have been moved to local.conf.sample.  This means users
will need to update their local.conf.