aballant01/cs4740-word-sense — pull request #2 by heejung (2012-03-25 18:14:57+00:00)
Title: Merge+Indentation+dis_file

Merged with Alistair's code.
Fixed indentation
Also modified dis_file to run the new feature generator as well.