need to gather facts on the docker machine as well
allow jukic.me domain for staging
use a separate redis container to allow saving the data
add a space after email prefix
human readable trial duration
change default values temporarily to avoid changing on every provisioning
custom message when user confirms his email
fix a bug when hostname is not defined
don't split urls, let customer.io handle that
configurable amount of cpu/ram for docker engine in shipyard
fix for multiple shipyard entries in hipache
Merge remote-tracking branch 'origin/feature/shipyard-ansible' into tomasz

Conflicts:
	launcher/deployment/models.py