Remove additional 'if' statement not removed from merge.  Change two settings documentation strings.
Remove additional 'if' statement not removed from merge.  Change two settings documentation strings.

cellml/libcellml,hsorby/libcellml,MichaelClerx/libcellml,libcellml/buildbot-testing,nickerso/libcellml,cellml/libcellml,cellml/libcellml,hsorby/libcellml,nickerso/libcellml,nickerso/libcellml,cellml/libcellml,hsorby/libcellml,MichaelClerx/libcellml,nickerso/libcellml,MichaelClerx/libcellml,hsorby/libcellml,libcellml/buildbot-testing