Adjust faketest env in tox.ini for new args order
Remove extra lines breaking PEP8
Merge remote-tracking branch 'origin/master' into app