Hadoop2

@kengoodhope what are your thoughts on tagging current camus as mr1 and merging this into master?