add rollup_threhold under contact media, add tests for interval too
s/mock/double/g, also tests for rollup_threshold in api
update all gems, set Oj to compatability with JSON via active_support/json
expose contact media rollup_threshold via api
add rollup threshold to contact detail page
stashing for now
Merge branch 'master' into 291_rollup_by_contacts_failures
merge from master, some manual merging
more questions than answers
add first feature tests for rollup
basic tests for rollup logic are passing, gh-291
Merge branch 'master' into 291_rollup_by_contacts_failures
manual merge
tweak cli steps to cleanup, grabbed a few bits from aruba and removed gem dep
fix step matching
Merge pull request #328 from ali-graham/327_fix_aruba_failure_behaviour

Fix aruba failure behaviour
exhibit rollup status in email notifications, very crudely
make kill_lingering_daemons stfu when all good
merge from master, resolve Gemfile.lock conflicts manually
re-add ffi and formatador