Refactored apt-sources
Added heroku tools