Added tox, updated deps a little