Frantext-specific fixes
merged from clovis
more frantext formatting fixes
Merge branches 'clovis-master' and 'master'
Merge pull request #3 from rwhaling/master

Merge new changes from Richard