Fix RERUN mode for dev, and adjust text output slightly
Adjust from rm to git reset
Adjust for --rerun, change settings/README
Merge pull request #135 from andymcc/sprint

Merged automatically by jenkins after successful gate test