Clean up empty affixes; html entities for curly quotes
Clean up superfluos groups
Remove hard coded curly quotes
Merge pull request #436 from tipichris/upstream

Code clean up