Adding greendots to the tox.ini.
Merge branch 'dev'

Merging in a minor tox.ini thing.
Change tox.ini to specify tests dir to pytest.

py.test is considering modules themselves tests to be skipped,
which is confusing and not something I want to think about. This
change doesn't eliminate the issue but it's a start.
Merge branch 'dev'

Small tox.ini change.