Merge pull request #35 from FeministSoftwareFoundation/mistress

Mere mistress into master