flake8 fixes
Merge branch 'run-all-tests-as-root-96' of github.com:clusterhq/flocker into run-all-tests-as-root-96
modify skipping tests to use non-root user when trial is run as root
flake8 fixes