Burning the village to save it.
More surgery with a hammer.
switched to use TAC version of Factorie.
Compiles, runs.
Fixed ser-de issues.
Merge branch 'testing'

Conflicts:
	pom.xml
	src/main/scala/edu/umass/cs/iesl/factorie_protobufs/FSTest.scala