Add support for Oscar 0.6
Update configuration for tox environments