Minor clean-up of Tox/Travis configs

Signed-off-by: Daniel Farrell <dfarrell@redhat.com>