Ignoring the data bags
Adding kombu to requirements
Adding new static root
Resolving merge conflicts
Attempting to get static files working