control updates for docker
Merge pull request #141 from ehazlett/docker-updates

control updates for docker
Fabfile updates.
Fabfile updates.
Fix host.
env for deploy
Merge pull request #142 from ehazlett/env-updates

env for deploy
env for deploy
Merge pull request #143 from ehazlett/env-updates

env for deploy
Fabfile update.
Add underscore subdomain redirect back in nginx.conf.