Merge pull request #338 from pfaffman/improve-discourse-setup