Update to patched version of Butterfly - fixes #652
Switch from TimerTask to ScheduledExecutorService for more robustness