This patch adjusts the role to allow for deployments of the docker, docker+machine and shell executors. The default is now the docker executor instead of the docker+machine executor. Also all defaults have been adjusted for this use case.
