Fix some English grammar in the demo .conf files
Also fix English grammar in conf file template
English - than/then error
Improved docstrings
Improve the English of the ReST report
Merge pull request #112 from sjbrown/misc-english

More English improvements