Reinstated Jim's build directory, more complete make clean
Merge branch 'master' of github.com:DarkEnergyScienceCollaboration/ImageSimulationRecipes