Manual Merge: graywolf336: Revamp Jail Command