Merge pull request #1 from bethard/master

Switch from scalala to breeze (allowing upgrade to Scala 2.10)
Building with Makefile
Unclobber deletions
Merge commit '94f7ee8c55ee2ae82baf44c2647a1c3bf6134677'

Conflicts:
	Makefile
	src/org/goobs/nlp/Convex.scala
Minor compilation fixes
Re-added package for real