Bring the forks in from the cold

[eponvert]

I hadn't realized, but it looks like the ScalaNLP fork has taken on a life of its own. Is that the main repo for this code now, @dhgarrette @parthatalukdar?

Should we bring the different versions in the network together?