Merge pull request #2190 from danhunsaker/feature/exit-status

Updated all CLI-valid cases of exit() to return a valid code