moby: Docker daemon doesn't start after updating to 1.7 on Ubuntu 15.04

I’m creating a new issue because I don’t think the issue I am experiencing is the same as #14035 as I have always used the aufs storage drive and the error I am getting doesn’t mention anything about the storage driver:

root@buildsrv:~# systemctl status -l docker
● docker.service - Docker Application Container Engine
   Loaded: loaded (/etc/systemd/system/docker.service; enabled; vendor preset: enabled)
   Active: failed (Result: start-limit) since Mon 2015-06-22 02:15:42 CDT; 7min ago
     Docs: https://docs.docker.com
 Main PID: 3217 (code=exited, status=0/SUCCESS)

Jun 22 02:15:42 buildsrv systemd[1]: Started Docker Application Container Engine.
Jun 22 02:15:42 buildsrv systemd[1]: Starting Docker Application Container Engine...
Jun 22 02:15:42 buildsrv docker[3217]: Please specify only one -H
Jun 22 02:15:42 buildsrv systemd[1]: start request repeated too quickly for docker.service
Jun 22 02:15:42 buildsrv systemd[1]: Failed to start Docker Application Container Engine.
Jun 22 02:15:42 buildsrv systemd[1]: Unit docker.service entered failed state.
Jun 22 02:15:42 buildsrv systemd[1]: docker.service failed.

The documentation says that -H can be included multiple times. Has this changed?? How would I specify both a tcp port and a unix socket then?