Cleanup and having command line overrides affect the generated lock
Merge pull request #11 from rspieldenner/cl_override_lock_generation

command line overrides can now affect lock generation