Revert a02471f with honcho workaround (PR #3028)

Makefile

@@ -8,8 +8,8 @@ venv := "./vendor/virtualenv-1.11.6.py"
 test_env_files := defaults.env,tests/test.env,tests/local.env
 pip := $(env_bin)/pip
 honcho := $(env_bin)/honcho
-honcho_run := $(honcho) run -e defaults.env,local.env
-py_test := $(honcho) run -e $(test_env_files) $(env_bin)/py.test
+honcho_run := $(honcho) -e defaults.env,local.env run
+py_test := $(honcho) -e $(test_env_files) $(env_bin)/py.test run
 
 ifdef PYTEST
 	pytest = ./tests/py/$(PYTEST)
@@ -37,7 +37,7 @@ schema: env
 
 schema-diff: test-schema
 	pg_dump -sO `heroku config:get DATABASE_URL -a gratipay` >prod.sql
-	$(honcho) run -e $(test_env_files) sh -c 'pg_dump -sO "$$DATABASE_URL"' >local.sql
+	$(honcho) -e $(test_env_files) run sh -c 'pg_dump -sO "$$DATABASE_URL"' >local.sql
 	diff -uw prod.sql local.sql
 	rm prod.sql local.sql
 
@@ -54,7 +54,7 @@ py: env
 	$(honcho_run) $(env_bin)/python -i gratipay/main.py
 
 test-schema: env
-	$(honcho) run -e $(test_env_files) ./recreate-schema.sh
+	$(honcho) -e $(test_env_files) run ./recreate-schema.sh
 
 pyflakes: env
 	$(env_bin)/pyflakes bin gratipay tests

README.md

@@ -163,7 +163,7 @@ If Gratipay launches successfully it will look like this:
 
 ```
 $ make run
-PATH=env/bin:{lots-more-of-your-own-PATH} env/bin/honcho run -e defaults.env,local.env web
+PATH=env/bin:{lots-more-of-your-own-PATH} env/bin/honcho -e defaults.env,local.env run web
 2014-07-22 14:53:09 [1258] [INFO] Starting gunicorn 18.0
 2014-07-22 14:53:09 [1258] [INFO] Listening at: http://0.0.0.0:8537 (1258)
 2014-07-22 14:53:09 [1258] [INFO] Using worker: sync
@@ -362,7 +362,7 @@ To invoke py.test directly you should use the `honcho` utility that comes
 with the install. First `make tests/env`, activate the virtualenv and then:
 
     [gratipay] $ cd tests/
-    [gratipay] $ honcho run -e defaults.env,local.env py.test
+    [gratipay] $ honcho -e defaults.env,local.env run py.test
 
 Local Database Setup
 --------------------

tests/js/utils/session.js

@@ -2,7 +2,7 @@ var exec = require('sync-exec');
 
 module.exports = function createSession(user) {
     return exec(
-        './env/bin/honcho run -e defaults.env,tests/test.env,tests/local.env ' +
+        './env/bin/honcho -e defaults.env,tests/test.env,tests/local.env run ' +
         './env/bin/python ./tests/js/utils/auth-helper.py ' + user
     ).stdout.slice(0, -1);
 };