point back at config-simple

This will be the new master branch. This way I can develop on joeyh and
merge joeyh to master to publish it, while keeping master using
config-simple
Merge branch 'joeyconfig'
add back +x on master
Merge branch 'joeyconfig'
Revert "ok, so dpkg-buildpackage adds +x.. new method"

This reverts commit 1bfa12b6888943a16369ffb76ffb1873b439689f.
add x back
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'

Conflicts:
	config.hs
Merge branch 'joeyconfig'
Merge branch 'joeyconfig'

Conflicts:
	config.hs
Merge branch 'joeyconfig'
docker linked containers can have multiple names, separated by ','

Look at the name that contains a containerid
adding support for linked containers
support volumes-from
Merge branch 'joeyconfig'

Conflicts:
	Propellor/Property/Docker.hs
Merge branch 'joeyconfig'