Removing TODO from tox file.

Also removing some trailing spaces (thanks emacs config).