Rebase discourse/master into fork

There were conflicts in several files. We can pretty easily pull out the values from the production.rb file and move them into the new discourse.conf file. The redis.yml file is more trick since the discourse.conf file isn't a template and we're using ruby in it. For now I left it like it is, but if we want to change it we easily can. I have a discourse.conf file with our values in it.