renaming to get access to the aggregate stuff
Merge branch 'hackweek' of github.com:rfaugeroux/jack into hackweek
resolved conflicts