Fixed DOS carriage return (copy-paste from word is evil)
Fixed typos
Wrapped text to 80 chars max
Restored lists removed while wrapping text
Fixed merge conflicts