Mere mistress into master

Please merge mistress into master, otherwise people are likely to miss any new commits made solely in mistress. Furthermore it re-enforces the idea that men are bottom feeders, existing solely off what we produce.