updated readme
merging in develop into master
readme cleanup
bundle update rails
configured heroku and foreman