Update configuration files to match ubuntu installation instructions.
Merge branch 'master' of github.com:baus/discourse