removed a duplicate entry for dansguardian
noted a few more features
minor wordsmithing improvements
clarified a sentence
wordsmithing improvements for clarity, minor repagination
added the \proposedtext command to delimit text being proposed and not yet fully accepted
added the \proposedtext command to delimit text being proposed and not yet fully accepted
resolved merge conflicts