Merge pull request #1946 from liblouis/various-fixes-and-cleanup

Various fixes and cleanup