Still mucking iwth the fabfile.
Set up logging.
Add env settings file.
Have fabfile overwrite env settings file.
Fix merge conflicts in fabfile.