Split terasort run into separate script to ensure it is killed if time runs out
Merge branch 'master' of https://github.com/chu11/magpie