Added alias for make, as well as handling the special set up case (where we don't wish to alias make until after our conf files are bult.