Fixing heroku commands in README.
Addings TODOs
merging conflicts in README