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
shortcut non-running options, fixes #316
rename some steps to avoid aruba clash
tests for bin/flapjack script stop/start/restart/reload, fixes #289
define method at top-level was failing in 1.9
tweak feature timing, try to fix travis 1.9 build
allow flapper to take an IP address to bind to

(also replaced 'p' local variable in script opts with 'pid', so as
 not to override Kernel#p. file it under general cleanup.)
add pattern-based entity/check lister, gh-77
add first feature tests for rollup
removed a couple of unused lines
cleanup
basic tests for rollup logic are passing, gh-291