Minor fixes not worthy of individual pulls
Adds fixtures to setup.py
Adds --san option for ordering CCI's
Merge pull request #251 from CrackerJackMack/cci_san_disks

Adds --san option for ordering CCI's
Merge pull request #250 from CrackerJackMack/minor

Minor fixes not worthy of individual pulls
Explicitly installs tox on travis
Merge pull request #252 from sudorandom/master

Explicitly installs tox w/travis