Simplify how ID is obtained

No need to force the user to submit the ID, just grab it from grains.
Still allows for minion ID to be passed on the CLI.