Updated from cascalog 1.10.0 to cascalog 2.1.0.

Unit tests pass.  Also tested in Amazon EMR.