(tox) Changed and added more flags to tox.ini
Merge pull request #25 from pbs/tox

Tox stuff