Remove docker-proxy from .gitignore.
Add upstart file for docker proxy daemon.
Merge branch 'upstart' into develop