added SummaryEstimators to bench runner
Fix compile
Merge branch 'master' into bench-descriptive-stats
Merge branch 'master' into bench-descriptive-stats
Merge branch 'master' into bench-descriptive-stats
Add an Alarm class
Add a CurOpMonitor which explodes after a certain alarm timer
Merge branch 'master' into curopmonitor
fix
Merge branch 'master' into curopmonitor
Merge branch 'master' into curopmonitor
Add back a line accidentally deleted
Merge branch 'master' into curopmonitor
Merge branch 'master' into curopmonitor
Revert "updated packaging to handle new README file"

This reverts commit 1f53a20ba83934f45247f6515fb988736256fb3b.
Merge branch 'bugfixes/tokumx-1.4'
updated release date for 1.4.0
updated debian changelog for 1.4.0
Merge branch 'bugfixes/tokumx-1.4'

Conflicts:
	debian/changelog
closes #481, abort txn before sleeping for five minutes