Switch master to v0.6.0.
merge server and worker as one image
removed worker recipe
update volume locations for dev mode
just mount the source into /app

all of the source is built into the root, including conf.d and
the django project. No need to separate the sources anymore
fix controller path issues
Revert "fix controller path issues"

This reverts commit fe4634ade2b02d6aa6d04159bc2d871266837939.
bind-mount the controller source
fix overlapping bind-mount volumes
Merge pull request #89 from opdemand/deis-controller

merge server and worker as one image
Updated CHANGELOG.md.
Merge branch 'master' into release