Merged requested to merge robby-dermody:master into master
Created by: robby-dermody
Reopened with the updated wording applied to the new i18n site as I messed up the rebase on the first one. I kept the tagline as-is due to lack of consensus with that.
For more info, please see #570 (closed) and relevant reddit thread.
I also tried to avoid the diff to the closing line, but the filetypes are showing up as DOS to me in vim (on linux), and converting to UNIX will modify all line endings in the file and produce a mess of a diff.