put workspace combination in Makefile
fix-workspace: separate options for --prune-norms and --drop-others-shapes and rename --remove-samples to --prune-samples
Merge pull request #3 from ndawe/master

fix-workspace updates