Update to heroku-go v0.3.1 w/ named addons.

Also remove untracked vendored heroku-go files.
Support named addons. Remove merging code.