Merge pull request #1670 from lurch/patch-1

Add flacour->flavour and update some suggestions