Updates for changes from UW
Move some UIUC settings to the general builds