Minor fixes not worthy of individual pulls
Adds fixtures to setup.py
Merge pull request #250 from CrackerJackMack/minor

Minor fixes not worthy of individual pulls