enabled env
OMerge branch 'master' of https://github.com/seattletimes/wp-knit

Conflicts:
	proto.conf