Pre-merge commit
Dicssusion update
Fetch
Clean up after pull request, remove site-specific information in favor of example.org format, and clean up variable names for config file