Move environment into App, kill a class.
Merge in latest master
Bump docs.