Improved -r command switch, and add tests for InitFile.is_reinstall_needed #baelfire-5 done