stall
def
Merge branch 'feature/cascalog_two' of github.com:nathanmarz/cascalog into feature/cascalog_two

Conflicts:
	cascalog-core/src/clj/cascalog/testing.clj