Still mucking iwth the fabfile.
Fix merge conflicts in fabfile.
Update settings.
Collect static