first commit
Merge branch 'calblock_does_all' of ssh://github.com/michaelaye/diviner into calblock_does_all