Significant bug fixes

Fixed feature function, works at the single word level now.  Also
updated collins.  Prediction now works correctly.
Merge branch 'paulexp'