local.conf updated
Merge branch 'master' of github.com:stolati/env