Integration pr

This is rearranging the two `.{git,hg}ignore` to mirror eachother, and making more effective use of pytest features.