Update README, remove TODO, update CHANGELOG
Merge branch 'master' of github.com:omwah/SDFEconomy
Fix merge from upstream