Merge pull request #18 from markhamstra/shark-0.9-csd

Syncing Hive up with AMPLab Hive