Update .gitignore

Missed a merge conflict
solve iss23
just a little bit of uima progress. also see wikipedia for info on documentation
working demo of lucene index. can now easily plug and play other search engines. you should be able to copy the principles here to integrate into the rest of the system
Documentation changes and adding of Indri (not yet impl until after class today)
Merge branch 'development'
Add hyphen trimmer and sample skip bigramn
removed unused imports
Clarify scorer method names
swap researcher with scorers
resolved iss23
Issue 27 -> map instead of enummap
Merge pull request #28 from SeanTater/uima_dev

Merge changes coming in from uima_dev
uima: adding indri and aggregate, working demo
Split researcher into early and late; fix and use CachingResearcher; Handle missing scores correctly
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim
Fixing capitalization-related issue
Fixing capitalization issue
not needed anymore
adding missing text file