#23 preparing for merge of consortium
Merge branch 'master' of https://github.com/DICE-UNC/jargon