updates to bitext classifier code
Merge remote branch 'origin/clir' into clir
fixed merge conflict in clpwsim documentation