Updated TODOs in README
Merge branch 'make-env-aware'