Fix to github mess with the files

This commit cleans some files of a series of addition made by GitHub
when resolving a merge conflict. The commit also has the addition of a
preview generation feature to faxrcvd!