honor --descriptor for --cli and --unit as well
some linty stuff
Merge pull request #882 from drewfish/run-descriptor

honor --descriptor for --cli and --unit as well