Replaced refs to server and worker with controller.

Author: mboersma

Makefile

@@ -12,16 +12,16 @@ coverage:
 	coverage html
 
 build:
-	docker build -t deis/server .
+	docker build -t deis/controller .
 
 run:
-	docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-server deis/server ; exit 0
+	docker run -rm -p $${PORT:-8000}:$${PORT:-8000} -e ETCD=$${ETCD:-127.0.0.1:4001} -name deis-controller deis/controller ; exit 0
 
 shell:
-	docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/server /bin/bash
+	docker run -t -i -rm -e ETCD=$${ETCD:-127.0.0.1:4001} deis/controller /bin/bash
 
 clean:
-	-docker rmi deis/server
+	-docker rmi deis/controller
 
 flake8:
 	flake8

README.md

@@ -2,9 +2,9 @@
 
 A Docker image containing a REST API and web server, for use in the [Deis](http://deis.io) open source PaaS.
 
-[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/server/)
+[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/controller/)
 
-[**Trusted Build**](https://index.docker.io/u/deis/server/)
+[**Trusted Build**](https://index.docker.io/u/deis/controller/)
 
 This Docker image is based on the trusted build [deis/base](https://index.docker.io/u/deis/base/), which itself is based on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) base image.