Adjust formatting
Merge branch 'deployment' of https://github.com/corinnelhh/chatbot into deployment
Resolve merge conflict in output_filters.py