Fixed recursive symlinks bug, added 'rerun', renamed 'rebuild' to
'restart'