Merge branch 'double-dash' of https://github.com/UKWebMedia/garethr-dock...

...er into previousnext/puppet-docker.

Conflicts:
	templates/etc/init/docker-run.conf.erb

Conflicts:
	templates/etc/init/docker-run.conf.erb