Minor changes to use TOX on Travis