Moving ENV variables

Hey @dsander.  Here's an improvement for your branch.  This moves the test ENV variables into a env file.

(Also merges in master, which makes it confusing.  The main commit is c3944cc)