Merge pull request #37 from joker-eph/master

(Mostly) cosmetic changes
Detect pytest-xdist instead of crashing :)