Various small fixes in text files
Merge branch 'master' into ubuntu
Updated copyright file and fixed man page issue.
Fixed line lengths