Don't install present addons
Merge branch 'master' of github.com:rainforestapp/heroku.json

Conflicts:
	lib/describer.rb
Create an app if non exist
Merge branch 'master' of github.com:rainforestapp/heroku.json

Conflicts:
	lib/describer.rb
Guess the name earlier on
Merge branch 'master' of github.com:rainforestapp/heroku.json

Conflicts:
	lib/heroku/command/json.rb