Merging in Brian's directory pruning, and changes to the cape