Unclobber deletions
Merge commit '94f7ee8c55ee2ae82baf44c2647a1c3bf6134677'

Conflicts:
	Makefile
	src/org/goobs/nlp/Convex.scala