Merge pull request #671 from Arantor/release-2.1

! Remove 'recode line endings' UI item. It is a feature that some might ...
Merge pull request #672 from Arantor/release-2.1

! Change the help description not to reference Trillian since Trillian d...