Use Dan's environment during AT stage
Merge pull request #58 from sorenh/reconcile-environments

Use Dan's environment during AT stage