Merge branch 'feature/contribs' into cascalog_two

Conflicts:
	cascalog-checkpoint/project.clj