F makefile edit

Just a couple of commits to tidy up a slight mistake with the difference between cleaning and clobbering. Now we can clean the debug or master without doing both.