Make sure add-apt-repository is available on Ubuntu > 12.04.

It looks like Ubuntu changed which package the command can be found in so we'll just install both to be safe.  This package doesn't exist on Ubuntu 10.04 LTS, however, so that might come back to bite us.
Merge remote-tracking branch 'upstream/master'